]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix that last commit
authorSamual <samual@xonotic.org>
Sat, 31 Mar 2012 01:18:29 +0000 (21:18 -0400)
committerSamual <samual@xonotic.org>
Sat, 31 Mar 2012 01:18:29 +0000 (21:18 -0400)
qcsrc/server/mutators/gamemode_ctf.qc

index 1b8d32355538ec17253db4b7955917718144b92e..1ff358ab9d476dacba59c1607cd1efe60a02cee2 100644 (file)
@@ -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)