Also play woosh sound (shotgun melee sound from Xonotic) when swing-hitting with...

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 04767f836d14587394a9dddf07fd02b26c2bf357..b630d6db2f3e6b04a79a3195197e372280515461 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -398,11 +398,10 @@ void Vore_StomachKick()
                sound(self.predator, CHAN_PROJECTILE, "weapons/stomachkick.wav", VOL_BASE, ATTN_NORM);\r
                self.predator.punchangle_x -= self.predator.cvar_cl_vore_kick_punchangle;\r
 \r
+               // if we still have a weapon, play the melee animation and sound\r
+               weapon_thinkf(WFRAME_FIRE2, time + cvar("g_balance_vore_kick_delay"), w_ready); // only intended to animate the gun, does not do any damage\r
                if(self.weapon)\r
-               {\r
-                       // if we still have a weapon, play the swing animation for it\r
-                       weapon_thinkf(WFRAME_FIRE2, time + cvar("g_balance_vore_kick_delay"), w_ready); // only intended to animate the gun, does not do any damage\r
-               }\r
+                       sound (self, CHAN_WEAPON, "weapons/grabber_melee.wav", VOL_BASE, ATTN_NORM);\r
 \r
                if(random() < cvar("g_balance_vore_kick_escapeprobability"))\r
                        Vore_Regurgitate(self);\r

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index b62ba3ba0cf34dcdedcac733d715ea8ed4e31a98..1de3ecfde37b3e0148c8774e0bdb3c1ace946147 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -195,6 +195,7 @@ float w_grabber(float req)
                precache_sound ("weapons/grabber_impact.wav"); // done by g_grabber.qc\r
                precache_sound ("weapons/grabber_fire.wav");\r
                precache_sound ("weapons/grabber_altfire.wav");\r
+               precache_sound ("weapons/grabber_melee.wav");\r
                precache_sound ("weapons/reload.wav");\r
        }\r
        else if (req == WR_SETUP)\r