Merge remote-tracking branch 'origin/Mario/lsmaps_count'

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

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 49e824ff0ddaecac78580cb648df75d026f9fc53..e332e55ed80de06b3b4ce73e6fa2f063d1f4d8d0 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -195,6 +195,13 @@ void InitGameplayMode()
                MUTATOR_ADD(gamemode_keepaway);
        }
 
+       if(g_invasion)
+       {
+               timelimit_override = 0; // no timelimit in invasion, round based
+               fraglimit_override = autocvar_g_invasion_round_limit;
+               MUTATOR_ADD(gamemode_invasion);
+       }
+
        if(teamplay)
                entcs_init();
 
@@ -234,6 +241,12 @@ void InitGameplayMode()
                else
                        g_race_qualifying = 0;
        }
+       
+       if(g_invasion)
+       {
+               inv_maxrounds = cvar("fraglimit");
+               cvar_set("fraglimit", "0");
+       }
 
        if(g_race || g_cts)
        {
@@ -277,7 +290,7 @@ string getwelcomemessage(void)
        }
        if(autocvar_g_start_weapon_laser == 0)
                modifications = strcat(modifications, ", No start weapons");
-       if(autocvar_sv_gravity < 800)
+       if(cvar("sv_gravity") < stof(cvar_defstring("sv_gravity")))
                modifications = strcat(modifications, ", Low gravity");
        if(g_cloaked && !g_cts)
                modifications = strcat(modifications, ", Cloaked");