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 ce0c10535b083b6f79e05f1bc29105bd5322f9bc..e332e55ed80de06b3b4ce73e6fa2f063d1f4d8d0 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -244,7 +244,7 @@ void InitGameplayMode()
        
        if(g_invasion)
        {
-               maxrounds = cvar("fraglimit");
+               inv_maxrounds = cvar("fraglimit");
                cvar_set("fraglimit", "0");
        }
 
@@ -290,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");