From: Mario Date: Sat, 14 Feb 2015 01:53:50 +0000 (+1100) Subject: Apply stalemate if there are at least 2 stale flags, regardless of team count X-Git-Tag: xonotic-v0.8.1~29^2~13 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=442559a2f8164aebe4e2547b5c6a5ec3dd8c98e8;p=xonotic%2Fxonotic-data.pk3dir.git Apply stalemate if there are at least 2 stale flags, regardless of team count --- diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc index dea4a2c28..c64049f40 100644 --- a/qcsrc/server/mutators/gamemode_ctf.qc +++ b/qcsrc/server/mutators/gamemode_ctf.qc @@ -693,11 +693,11 @@ void ctf_CheckStalemate(void) if(ctf_oneflag && stale_flags == 1) ctf_stalemate = true; - else if(stale_flags == ctf_teams) + else if(stale_flags >= 2) ctf_stalemate = true; else if(stale_flags == 0 && autocvar_g_ctf_stalemate_endcondition == 2) { ctf_stalemate = false; wpforenemy_announced = false; } - else if(stale_flags < ctf_teams && autocvar_g_ctf_stalemate_endcondition == 1) + else if(stale_flags < 2 && autocvar_g_ctf_stalemate_endcondition == 1) { ctf_stalemate = false; wpforenemy_announced = false; } // if sufficient stalemate, then set up the waypointsprite and announce the stalemate if necessary