Rename a particle effect

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index b1859829486a33e6b03eba46b1feae54dc19ce18..1cf39dbf700c2f7a044b16ae862de994f9815d60 100644 (file)
--- a/data/effectinfo.txt
+++ b/data/effectinfo.txt
@@ -4842,7 +4842,7 @@ airfriction 1
 \r
 // regurgitate effect\r
 // used in: vore.qc:   pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1)\r
 \r
 // regurgitate effect\r
 // used in: vore.qc:   pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1)\r

-effect regurgitate\r
+effect vore_regurgitate\r

 count 30\r
 type blood\r
 tex 24 32\r
 count 30\r
 type blood\r
 tex 24 32\r


@@ -4856,8 +4856,8 @@ velocityjitter 192 192 32
 velocitymultiplier 5\r
 staincolor 0x408000 0x80FF00\r
 staintex 16 24\r
 velocitymultiplier 5\r
 staincolor 0x408000 0x80FF00\r
 staintex 16 24\r

-//blood mist\r
-effect regurgitate\r
+//green mist\r
+effect vore_regurgitate\r

 countabsolute 10\r
 type alphastatic\r
 tex 0 8\r
 countabsolute 10\r
 type alphastatic\r
 tex 0 8\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 548877415c9a1d05aa5405e04c5f30c4c8602591..e47b06553a0be0af23502af82b28181c5ef4861d 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -381,7 +381,7 @@ void Vore_Regurgitate(entity e)
 \r
        PlayerSound(e.predator, playersound_regurgitate, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
        setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
 \r
        PlayerSound(e.predator, playersound_regurgitate, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
        setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r

-       pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1);\r
+       pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', 1);\r

        e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_punchangle");\r
        e.predator.stomach_load -= 1;\r
        e.predator.regurgitate_prepare = 0;\r
        e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_punchangle");\r
        e.predator.stomach_load -= 1;\r
        e.predator.regurgitate_prepare = 0;\r