From: Mario <mario.mario@y7mail.com>
Date: Wed, 11 Sep 2013 08:28:55 +0000 (+1000)
Subject: Fix stalemate
X-Git-Tag: xonotic-v0.8.1~29^2~38
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b71325b30eb0a34b8f04bb044f14046a684be49a;p=xonotic%2Fxonotic-data.pk3dir.git

Fix stalemate
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index ea9f31f28..29b428857 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -143,7 +143,7 @@ float ctf_Stalemate_customizeentityforclient()
 	entity e, wp_owner;
 	e = WaypointSprite_getviewentity(other);
 	wp_owner = self.owner;
-		
+	
 	// team waypoints
 	if(!ctf_IsDifferentTeam(wp_owner.flagcarried, wp_owner))
 		return FALSE;
@@ -668,7 +668,7 @@ void ctf_CheckStalemate(void)
 		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 && stale_flags >= 1 && autocvar_g_ctf_stalemate_endcondition == 1)
+	else if(stale_flags < ctf_teams && 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