]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
More fixes...
authorSamual <samual@xonotic.org>
Sat, 31 Mar 2012 06:03:05 +0000 (02:03 -0400)
committerSamual <samual@xonotic.org>
Sat, 31 Mar 2012 06:03:05 +0000 (02:03 -0400)
qcsrc/server/mutators/gamemode_ctf.qc

index d2144ad60dd1e66895cd5c9d40ad1856c6d4e8b9..af197151f7b30b6f64a586617b4f570bb8d72eae 100644 (file)
@@ -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);