From: Samual <samual@xonotic.org>
Date: Sat, 31 Mar 2012 01:18:29 +0000 (-0400)
Subject: Fix that last commit
X-Git-Tag: xonotic-v0.7.0~240^2~152
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a8c78504f22603ca1b9ca1ffce0fa0caa38602b1;p=xonotic%2Fxonotic-data.pk3dir.git

Fix that last commit
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 1b8d32355..1ff358ab9 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -514,11 +514,15 @@ void ctf_FlagTouch()
 	if(gameover) { return; }
 	if(!self) { return; }
 	if(other.deadflag != DEAD_NO) { return; }
-	if((other.classname != "player") && (self.wait > time))
-	{  // The flag just touched an object, most likely the world
-		pointparticles(particleeffectnum("kaball_sparks"), self.origin, '0 0 0', 1);
-		sound(self, CH_TRIGGER, self.snd_flag_touch, VOL_BASE, ATTN_NORM);
-		return; 
+	
+	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
+		{
+			pointparticles(particleeffectnum("kaball_sparks"), self.origin, '0 0 0', 1);
+			sound(self, CH_TRIGGER, self.snd_flag_touch, VOL_BASE, ATTN_NORM);
+		}
+		return;
 	}
 
 	switch(self.ctf_status)