Merge branch 'master' into Mario/monsters

[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 c72c975ca2e3d86bb21f3f459e922d2e52db489e..750f1c4f06f4ba6e9974e7e237580b8289c5f02a 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -417,7 +417,6 @@ void cvar_changes_init()
                BADCVAR("sv_vote_master_commands");
                BADCVAR("sv_vote_master_password");
                BADCVAR("sv_vote_simple_majority_factor");
                BADCVAR("sv_vote_master_commands");
                BADCVAR("sv_vote_master_password");
                BADCVAR("sv_vote_simple_majority_factor");

-               BADCVAR("sys_ticrate");

                BADCVAR("teamplay_mode");
                BADCVAR("timelimit_override");
                BADCVAR("g_spawnshieldtime");
                BADCVAR("teamplay_mode");
                BADCVAR("timelimit_override");
                BADCVAR("g_spawnshieldtime");


@@ -1676,7 +1675,7 @@ float WinningCondition_Onslaught()
 
        WinningConditionHelper(); // set worldstatus
 
 
        WinningConditionHelper(); // set worldstatus
 

-       if(inWarmupStage)
+       if(warmup_stage)

                return WINNING_NO;
 
        // first check if the game has ended
                return WINNING_NO;
 
        // first check if the game has ended


@@ -2069,7 +2068,7 @@ void CheckRules_World()
        fraglimit = autocvar_fraglimit;
        leadlimit = autocvar_leadlimit;
 
        fraglimit = autocvar_fraglimit;
        leadlimit = autocvar_leadlimit;
 

-       if(inWarmupStage || time <= game_starttime) // NOTE: this is <= to prevent problems in the very tic where the game starts
+       if(warmup_stage || time <= game_starttime) // NOTE: this is <= to prevent problems in the very tic where the game starts

        {
                if(timelimit > 0)
                        timelimit = 0; // timelimit is not made for warmup
        {
                if(timelimit > 0)
                        timelimit = 0; // timelimit is not made for warmup