From: Samual <samual@xonotic.org>
Date: Sat, 31 Mar 2012 06:03:05 +0000 (-0400)
Subject: More fixes...
X-Git-Tag: xonotic-v0.7.0~240^2~146
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6bc87fcdd2e496a3ac4635494007db199bca23c3;p=xonotic%2Fxonotic-data.pk3dir.git

More fixes...
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index d2144ad60..af197151f 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -544,13 +544,9 @@ void ctf_FlagThink()
 			if(autocvar_g_ctf_dropped_capture_radius)
 			{
 				for(tmp_entity = ctf_worldflaglist; tmp_entity; tmp_entity = tmp_entity.ctf_worldflagnext)
-				{
 					if(tmp_entity.ctf_status == FLAG_DROPPED)
-					if(vlen(self.origin - tmp_entity.origin) < autocvar_g_ctf_dropped_capture_radius)
-					{
-						ctf_Handle_Dropped_Capture(self, tmp_entity);
-					}
-				}
+						if(vlen(self.origin - tmp_entity.origin) < autocvar_g_ctf_dropped_capture_radius)
+							ctf_Handle_Dropped_Capture(self, tmp_entity);
 			}
 			return;
 		}
@@ -599,7 +595,7 @@ void ctf_FlagTouch()
 	
 	if(other.classname != "player") // The flag just touched an object, most likely the world
 	{
-		if(self.wait > time) // if we haven't in a while, play a sound/effect
+		if(time > self.wait) // if we haven't in a while, play a sound/effect
 		{
 			pointparticles(particleeffectnum("kaball_sparks"), self.origin, '0 0 0', 1);
 			sound(self, CH_TRIGGER, self.snd_flag_touch, VOL_BASE, ATTN_NORM);