Merge remote-tracking branch 'origin/fruitiex/animations'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_world.qc

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 1ba0a54eba6451f324d5555a876c51985e00d086..93157819efe8f6685c7594ba38e0f35942d0fe2a 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -393,6 +393,8 @@ void cvar_changes_init()
                BADPREFIX("sv_maxidle_");
                BADPREFIX("sv_vote_");
                BADPREFIX("timelimit_");
+               BADCVAR("gameversion");
+               BADPREFIX("gameversion_");
 
                // allowed changes to server admins (please sync this to server.cfg)
                // vi commands:
@@ -404,6 +406,7 @@ void cvar_changes_init()
                BADCVAR("bot_number");
                BADCVAR("bot_prefix");
                BADCVAR("bot_suffix");
+               BADCVAR("bot_config_file");
                BADCVAR("capturelimit_override");
                BADCVAR("fraglimit_override");
                BADCVAR("gametype");
@@ -700,10 +703,6 @@ void spawnfunc_worldspawn (void)
                if(self.spawnflags & SPAWNFLAG_NO_WAYPOINTS_FOR_ITEMS)
                        bot_waypoints_for_items = 0;
 
-       // for setting by mapinfo
-       q3acompat_machineshotgunswap = autocvar_sv_q3acompat_machineshotgunswap;
-       cvar_set("sv_q3acompat_machineshotgunswap", "0");
-
        precache();
 
        WaypointSprite_Init();
@@ -811,6 +810,7 @@ void spawnfunc_worldspawn (void)
 
        addstat(STAT_WEAPONS, AS_INT, weapons);
        addstat(STAT_SWITCHWEAPON, AS_INT, switchweapon);
+       addstat(STAT_SWITCHINGWEAPON, AS_INT, switchingweapon);
        addstat(STAT_GAMESTARTTIME, AS_FLOAT, stat_game_starttime);
        addstat(STAT_ALLOW_OLDNEXBEAM, AS_INT, stat_allow_oldnexbeam);
        Nagger_Init();
@@ -1356,7 +1356,7 @@ void IntermissionThink()
                return;
 
        if(!mapvote_initialized)
-               if (time < intermission_exittime + 10 && !self.BUTTON_ATCK && !self.BUTTON_JUMP && !self.BUTTON_ATCK2 && !self.BUTTON_HOOK && !self.BUTTON_USE)
+               if (time < intermission_exittime + 10 && !(self.BUTTON_ATCK || self.BUTTON_JUMP || self.BUTTON_ATCK2 || self.BUTTON_HOOK || self.BUTTON_USE))
                        return;
 
        MapVote_Start();