Cleanup

README.html

@@ -3,17 +3,16 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta http-equiv="refresh" content="0; url=docs/index.html">
-    <meta name="description" content="Documentation index of the game AssaultCube @ http://assault.cubers.net/">
+    <meta name="description" content="Documentation index of the game AssaultCube @ https://assault.cubers.net/">
     <meta name="author" content="Rabid Viper Productions">
     <meta name="copyright" content="You may be able to redistribute this content under specific conditions.
-    Please read the licensing information, available @ http://assault.cubers.net/docs/license.html for the
+    Please read the licensing information, available @ https://assault.cubers.net/docs/license.html for the
     conditions that would apply to what you may be redistributing.">
     <title>AssaultCube Documentation</title>
     <style type="text/css">
-      body
-        {
-          background-color: #222222;
-        }
+      body {
+        background-color: #222222;
+      }
     </style>
   </head>
   <body>

config/scripts.cfg

@@ -288,7 +288,7 @@ const reconnect [ if $numargs [ tempalias svpass $arg1 ] [ tempalias svpass [] ]
 
 const dlmap [ getmap $arg1 [ sleep 2500 (concat map $arg1) ] ]
 const rndmap [ result (at $__defaultmaps (rnd (listlen $__defaultmaps))) ]
-const rrnd [ + (rnd (- $arg2 $arg1)) $arg1 ]
+const rrnd [ + (rnd (+ (- $arg2 $arg1) 1)) $arg1]
 
 const listaverage [ push sum "" ; looplist $arg1 n [ +=f sum $n ] ; if (strlen $sum) [ div=f sum (listlen $arg1) ] ; result (pop sum) ]
 

install_or_remove_menuitem.sh

@@ -6,7 +6,7 @@ CUBE_EXEC=assaultcube.sh
 LAUNCHERPATH="${HOME}/.local/share/applications/"
 
 LAUNCHERFILE=assaultcube_dev.desktop
-LAUNCHERTITLE="Assaultcube v1.2dev"
+LAUNCHERTITLE="AssaultCube v1.2dev"
 
 # Remove existing menuitem, if it exists:
 EXISTINGEXEC=`find "${LAUNCHERPATH}" -name "assaultcube*" | xargs`

source/dev_tools/packaging_guide.txt

@@ -19,7 +19,7 @@ II. Part 2 - concerns AssaultCube folder purposed to packaging:
 4. Delete the whole source/ folder, but only then, if you prepare .exe, .dmg etc. installer (generally at least for Windows and Mac). DON'T delete it, if compressed archive/package is prepared on Linux, instead of that delete source/doxygen/, source/vcpp/, source/xcode/, source/lib/ folders and source/codeblocks/AssaultCube.cbp file.
 5. Delete config/autoexec.cfg, config/favourites.cfg, config/pcksources.cfg, config/init*.cfg, config/saved*.cfg, config/servervita*.cfg, config/servers.cfg, config/history, clientlog*.txt, packages/maps/*.cgz and .cfg, packages/maps/servermaps/incoming/*.cgz and .cfg, if existent.
 6. Delete contents of screenshots/ folder.
-7. Delete contents of demos/ folder, besides tutorial_demo.dmo, if existent.
+7. Delete contents of demos/ folder except tutorial_demo.dmo, if existent.
 8. Delete for Windows all remaining *.sh files, and for Linux and Mac all remaining *.bat files. Delete the bin_*/ folders that are not needed on the target platform.
 9. Generate checksum file packages/misc/checksums_md5.txt, with use source/dev_tools/generate_md5_checksums.* script (generally at least on Linux).
 10. Package AC (.exe/.tar.bz2/etc.) and name it like AssaultCube_vMAJOR.MINOR.BUILD.REVISION.EXTENSION - on Windows this could be AssaultCube_v1.0.0.0.exe

source/dev_tools/releasing_guide.txt

@@ -5,6 +5,7 @@ Note: changes should be commited.
 I. Documentation ("assaultcube.github.io" repository):
 
 1. Change everywhere number of AC version, date in copyrights info, release notes, uninstall notes, changelog, download page (download links are predicable on GitHub), etc.
+See also https://github.com/assaultcube/assaultcube.github.io/blob/master/README.md - "LIST OF FILES TO CHANGE UPON NEW RELEASES: [...]".
 2. Add release tag (vMAJOR.MINOR.BUILD.REVISION) to the "master" branch in assaultcube.github.io repository.
 3. Synchronise local and remote "master" branches in assaultcube.github.io repository.
 
@@ -20,6 +21,7 @@ II. AssaultCube ("AC" repository - "master" branch):
 8. Change everywhere path to profile to assaultcube/v.MAJOR.MINOR .
 9. Change protocol number, if necessary.
 10. Update changelog.txt file.
-11. Add release tag (vMAJOR.MINOR.BUILD.REVISION) to the "master" branch in AC repository. 
-12. Synchronise local and remote "master" branches in AC repository.
+11. Change links in README.md file.
+12. Add release tag (vMAJOR.MINOR.BUILD.REVISION) to the "master" branch in AC repository.
+13. Synchronise local and remote "master" branches in AC repository.
 

source/src/weapon.cpp

@@ -876,7 +876,7 @@ void r_accuracy(int h)
         float acc = accuracym[i].shots ? 100.0 * accuracym[i].hits / (float)accuracym[i].shots : 0;
         if(i == GUN_GRENADE || i == GUN_SHOTGUN)
         {
-            formatstring(line)("\f5%5.1f%% (%.1f/%d): \f0%s", acc, accuracym[i].hits, (int)accuracym[i].shots, weapstr(i));
+            formatstring(line)("\f5%5.1f%% (%.1f/%d): \f0%s", acc, accuracym[i].hits, accuracym[i].shots, weapstr(i));
         }
         else
         {
@@ -896,7 +896,7 @@ void accuracyinfo()
         string line;
         if(i == GUN_GRENADE || i == GUN_SHOTGUN)
         {
-            formatstring(line)("\f0%-10s\t\f5 %.1f%% (%.1f/%d)", weapstr(i), acc, accuracym[i].hits, (int)accuracym[i].shots);
+            formatstring(line)("\f0%-10s\t\f5 %.1f%% (%.1f/%d)", weapstr(i), acc, accuracym[i].hits, accuracym[i].shots);
         }
         else
         {