From 9a86943d9988fa6ffa995e2f495658d3b9bc115c Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 29 Aug 2013 18:46:51 +1000 Subject: [PATCH] Fix round limit not getting set --- qcsrc/server/autocvars.qh | 2 +- qcsrc/server/mutators/gamemode_invasion.qc | 3 ++- qcsrc/server/teamplay.qc | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 0a2daf501..c414382b6 100644 --- 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 90d18d4fc..3355a7c7d 100644 --- 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 d6872d83f..c206fcbda 100644 --- 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) { -- 2.39.2