Merge branch 'master' into release_1.3

SECURITY.md

@@ -0,0 +1,10 @@
+### Security Policy
+
+To report a security vulnerability/problem in AssaultCube (client, server, website),
+including exploits which lead to the crash of the clients or servers in multiplayer mode,
+please create [an issue on GitHub](https://github.com/assaultcube/AC/issues) titled: **Security issue**
+
+For each reporter of the security issue a private project board will be created on GitHub, where he will be able to post the details for this and future security issues.
+A link to the private project board will be post in a comment for the issue.
+
+Thanks!

config/menus.cfg

@@ -10,7 +10,7 @@ menuitem Demo         [ showmenu [Play demo] ]
 menuitem Editing      [ showmenu editing ]
 menuitem Help         [ showmenu help ]
 menuitem About        [ showmenu about ]
-menuitem Quit         savequit
+menuitem "Quit AssaultCube"         quit
 
 
 // Add maps to the below list to include them in the normal map menu (also for botmaps).
@@ -60,7 +60,7 @@ menuitem "Watch other demo" [ stopdemo; closecurmenu; showmenu [Play demo] ]
 menuitem "Search demo\i\3" [ showmenu [search demo] ]
 menuitem "" -1
 menuitem "\f4Main menu\i\3" [ closecurmenu; showmenu main ]
-menuitem "\f3Quit AssaultCube" savequit
+menuitem "\f3Quit AssaultCube" quit
 
 ////  Watching demo > rewind  ////
 
@@ -137,17 +137,6 @@ menuitem "AssaultCube is a total-conversion of the CUBE engine" -1
 menuitem "by Wouter 'Aardappel' van Oortmerssen, and others:" -1
 menuitem "\t\f1http://www.cubeengine.com/" -1
 
-////  Main > Quit  ////
-
-newmenu quit
-menuitem "Yes, quit now" quit
-menuitem "No" [ showmenu [] ]
-menuitem "" -1
-menuitemcheckbox "Don't ask next time: " [(= $askquit 0)] [askquit = (= $arg1 0)]
-
-// Show quit dialog if enabled
-const savequit [ if $askquit [ showmenu quit ] quit ]
-
 
 // Create additional menus...
 exec config/menus_bot.cfg

config/menus_multiplayer.cfg

@@ -49,7 +49,7 @@ tempalias __ingamemenu_2 [
     menuitem "\f4Main menu\i\3"                   [ closecurmenu; showmenu main ]
     menuitem "\f4Browse servers\i\3"              [ closecurmenu; ifauthsetup joinservermenu ]
     menuitem "\f3Disconnect from server"           disconnect
-    menuitem "\f3Quit AssaultCube"                 savequit
+    menuitem "\f3Quit AssaultCube"                 quit
 ]
 
 const __ingamemenu_showmodel [

config/menus_settings.cfg

@@ -497,7 +497,6 @@ looplist [
 ////  Main > Settings > Misc  ////
 
 newmenu Misc
-alias askquit 1
 alias showmenuonstartup 1
 alias menufilesort_cgz 0
 alias menufilesort_dmo 0
@@ -513,7 +512,6 @@ tempalias __getscreenshottype [
 menuitemcheckbox "Auto map download: " "$autogetmap"                 [ autogetmap $arg1 ]
 menuitem         "Configure auto media download \i\1"                 [ showmenu "Autodownload config"]
 menuitemradio "Show gamemode names " 0 1 "$modeacronyms" [ verbal abbreviated ] [ modeacronyms $arg1 ]
-menuitemcheckbox "Show quit dialog when quitting: " "$askquit"       [ askquit = $arg1 ]
 menuitemcheckbox "Show main menu when starting AC: " "$showmenuonstartup"   [ showmenuonstartup = $arg1 ]
 menuitemcheckbox "Auto-screenshot: " "$autoscreenshot"               [ autoscreenshot $arg1 ]
 menuitemcheckbox "Allow HUD echos: " "$allowhudechos"                [ allowhudechos $arg1 ]

source/src/entity.h

@@ -552,7 +552,7 @@ public:
     {
         const int maxskin[2] = { 4, 6 };
         t = team_base(t < 0 ? team : t);
-        nextskin[t] = iabs(s) % maxskin[t];
+        nextskin[t] = (s & 63) % maxskin[t];
     }
     void startmap()
     {