Implement "FLAG_TOUCHRATE" to limit the sounds/effects used when a flag is touched...

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 2d0a4c1da30f77a64239dcb51bc288ae4f47b72d..1b8d32355538ec17253db4b7955917718144b92e 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -514,13 +514,12 @@ void ctf_FlagTouch()
        if(gameover) { return; }
        if(!self) { return; }
        if(other.deadflag != DEAD_NO) { return; }
-       if(other.classname != "player") 
+       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; 
        }
-       else if(self.wait > time) { return; }
 
        switch(self.ctf_status) 
        {       
@@ -546,6 +545,8 @@ void ctf_FlagTouch()
                        dprint("Touch: Flag exists with no status?\n");
                        break;
        }
+       
+       self.wait = time + FLAG_TOUCHRATE;
 }
 
 void ctf_RespawnFlag(entity flag)

diff --git a/qcsrc/server/mutators/gamemode_ctf.qh b/qcsrc/server/mutators/gamemode_ctf.qh
index 63ac7a0cfd66cbb5e9819b189dbe27c6e3b4f913..c089b999af801fc180a8bf1c97f3f2cc7e144466 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qh
+++ b/qcsrc/server/mutators/gamemode_ctf.qh
@@ -24,6 +24,7 @@ void spawnfunc_ctf_team();
 #define FLAG_SCALE 0.6
 
 #define FLAG_THINKRATE 0.2
+#define FLAG_TOUCHRATE 0.5
 
 #define FLAG_DROP_OFFSET ('0 0 32')
 #define FLAG_CARRY_OFFSET ('-15 0 7')