Fix round limit not getting set

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

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index d6872d83f566791010e78e4179b654325012059c..c206fcbdaab52d4d1fbfb8b28993cdb78a93d253 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -202,8 +202,6 @@ void InitGameplayMode()
        {
                timelimit_override = 0; // no timelimit in invasion, round based
                fraglimit_override = autocvar_g_invasion_round_limit;
-               maxrounds = fraglimit_override;
-               fraglimit_override = 0; // also no frag limit
                MUTATOR_ADD(gamemode_invasion);
        }
 
@@ -246,6 +244,12 @@ void InitGameplayMode()
                else
                        g_race_qualifying = 0;
        }
+       
+       if(g_invasion)
+       {
+               maxrounds = cvar("fraglimit");
+               cvar_set("fraglimit", "0");
+       }
 
        if(g_race || g_cts)
        {