Merge branch 'master' into Mario/movetype_push

diff --combined qcsrc/server/g_world.qc
index 56dc473a9466429cb9d998c689721825ef567e05,48da1b5dc9bfa6e09092a6876bf31d5bdf744f10..e8fea97b7c59e2229e95e3c60ead9ecfb50da10d
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -294,6 -294,7 +294,7 @@@ void cvar_changes_init(
                BADCVAR("nextmap");
                BADCVAR("teamplay");
                BADCVAR("timelimit");
+               BADCVAR("g_mapinfo_settemp_acl");
                BADCVAR("g_mapinfo_ignore_warnings");
                BADCVAR("g_maplist_ignore_sizes");
                BADCVAR("g_maplist_sizes_count_bots");
@@@ -347,8 -348,11 +348,11 @@@
                BADCVAR("g_freezetag_point_limit");
                BADCVAR("g_glowtrails");
                BADCVAR("g_hats");
+               BADCVAR("g_casings");
                BADCVAR("g_invasion_point_limit");
                BADCVAR("g_jump_grunt");
+               BADCVAR("g_keepaway_ballcarrier_effects");
+               BADCVAR("g_keepawayball_effects");
                BADCVAR("g_keyhunt_point_leadlimit");
                BADCVAR("g_nexball_goalleadlimit");
                BADCVAR("g_new_toys_autoreplace");
@@@ -2064,20 -2068,21 +2068,20 @@@ void Physics_Frame(
  
        IL_EACH(g_moveables, true,
        {
 -              if(IS_CLIENT(it) || it.classname == "" || it.move_movetype == MOVETYPE_PUSH || it.move_movetype == MOVETYPE_FAKEPUSH || it.move_movetype == MOVETYPE_PHYSICS)
 +              if(IS_CLIENT(it) || it.classname == "" || it.move_movetype == MOVETYPE_PHYSICS)
                        continue;
  
                //set_movetype(it, it.move_movetype);
                // inline the set_movetype function, since this is called a lot
 -              it.movetype = (it.move_qcphysics) ? MOVETYPE_NONE : it.move_movetype;
 +              it.movetype = (it.move_qcphysics) ? MOVETYPE_QCENTITY : it.move_movetype;
  
 -              if(it.move_movetype == MOVETYPE_NONE)
 -                      continue;
 -
 -              if(it.move_qcphysics)
 +              if(it.move_qcphysics && it.move_movetype != MOVETYPE_NONE)
                        Movetype_Physics_NoMatchTicrate(it, PHYS_INPUT_TIMELENGTH, false);
  
                if(it.movetype >= MOVETYPE_USER_FIRST && it.movetype <= MOVETYPE_USER_LAST) // these cases have no think handling
                {
 +                      if(it.move_movetype == MOVETYPE_PUSH || it.move_movetype == MOVETYPE_FAKEPUSH)
 +                              continue; // these movetypes have no regular think function
                        // handle thinking here
                        if (getthink(it) && it.nextthink > 0 && it.nextthink <= time + frametime)
                                RunThink(it);
@@@ -2089,7 -2094,7 +2093,7 @@@
  
        IL_EACH(g_moveables, it.move_qcphysics,
        {
 -              if(IS_CLIENT(it) || is_pure(it) || it.classname == "" || it.move_movetype == MOVETYPE_NONE)
 +              if(IS_CLIENT(it) || it.classname == "" || it.move_movetype == MOVETYPE_NONE)
                        continue;
                Movetype_Physics_NoMatchTicrate(it, PHYS_INPUT_TIMELENGTH, false);
        });
@@@ -2209,6 -2214,11 +2213,11 @@@ void Shutdown(
        if(world_initialized > 0)
        {
                world_initialized = 0;
+ 
+               // if a timeout is active, reset the slowmo value to normal
+               if(timeout_status == TIMEOUT_ACTIVE)
+                       cvar_set("slowmo", ftos(orig_slowmo));
+ 
                LOG_TRACE("Saving persistent data...");
                Ban_SaveBans();