Use the new effects now

diff --git a/effectinfo.txt b/effectinfo.txt
index 38413d3c622aa32af70926abdb2e1b8649458327..9258efaa3dcb5f0d5e9c8150b18142f46a275609 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -7636,4 +7636,36 @@ velocityjitter 10 10 10
 originjitter 80 80 80
 sizeincrease -10
 airfriction 0.04
-gravity -0.2
\ No newline at end of file
+gravity -0.2
+
+// redflag_touch -- effects for touching the red flag
+// used nowhere in code
+effect redflag_touch
+count 35
+type spark
+tex 40 40
+color 0xFF0000 0x970000
+size 1 3
+alpha 0 256 556
+gravity 1
+bounce 1.5
+originjitter 1 1 1
+velocityjitter 300 300 300
+velocitymultiplier 0.5
+airfriction 3
+
+// blueflag_touch -- effects for touching the blue flag
+// used nowhere in code
+effect blueflag_touch
+count 35
+type spark
+tex 40 40
+color 0x0000FF 0x000097
+size 1 3
+alpha 0 256 556
+gravity 1
+bounce 1.5
+originjitter 1 1 1
+velocityjitter 300 300 300
+velocitymultiplier 0.5
+airfriction 3

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 74cc22fe2417d5cef2055807e8e6a7e9a50e801b..2eeee683e15b42f7edf4e3f1b87034f80427b3de 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -794,7 +794,7 @@ void ctf_FlagTouch()
        {
                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);
+                       pointparticles(particleeffectnum(self.toucheffect), self.origin, '0 0 0', 1);
                        sound(self, CH_TRIGGER, self.snd_flag_touch, VOL_BASE, ATTN_NORM);
                        self.wait = time + FLAG_TOUCHRATE;
                }