Fix round limit not getting set

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 0a2daf501b7c612c04459c7b7f352d30754f0aec..c414382b6aac6cf2f136a80b8c2006f5e16857b4 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1258,7 +1258,7 @@ float autocvar_g_touchexplode_damage;
 float autocvar_g_touchexplode_edgedamage;
 float autocvar_g_touchexplode_force;
 float autocvar_g_invasion_round_timelimit;
-float autocvar_g_invasion_round_limit;
+#define autocvar_g_invasion_round_limit cvar("g_invasion_round_limit")
 float autocvar_g_invasion_warmup;
 float autocvar_g_invasion_monster_count;
 float autocvar_g_invasion_zombies_only;

diff --git a/qcsrc/server/mutators/gamemode_invasion.qc b/qcsrc/server/mutators/gamemode_invasion.qc
index 90d18d4fc9df02275395e80488e6b718b4c55b66..3355a7c7d27e5dda06c65ed176a6e584b4f6228c 100644 (file)
--- a/qcsrc/server/mutators/gamemode_invasion.qc
+++ b/qcsrc/server/mutators/gamemode_invasion.qc
@@ -249,7 +249,8 @@ MUTATOR_HOOKFUNCTION(invasion_PlayerCommand)
 
 MUTATOR_HOOKFUNCTION(invasion_SetStartItems)
 {
-       start_armorvalue = 100;
+       start_health = 200;
+       start_armorvalue = 200;
        
        return FALSE;
 }

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)
        {