From: MirceaKitsune Date: Sat, 16 Apr 2011 23:15:24 +0000 (+0300) Subject: Also play woosh sound (shotgun melee sound from Xonotic) when swing-hitting with... X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3538b6ef13b3cc4eecf72d6e961a81a133391e6e;p=voretournament%2Fvoretournament.git Also play woosh sound (shotgun melee sound from Xonotic) when swing-hitting with the Grabber. --- diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 04767f83..b630d6db 100644 --- 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); self.predator.punchangle_x -= self.predator.cvar_cl_vore_kick_punchangle; + // if we still have a weapon, play the melee animation and sound + weapon_thinkf(WFRAME_FIRE2, time + cvar("g_balance_vore_kick_delay"), w_ready); // only intended to animate the gun, does not do any damage if(self.weapon) - { - // if we still have a weapon, play the swing animation for it - weapon_thinkf(WFRAME_FIRE2, time + cvar("g_balance_vore_kick_delay"), w_ready); // only intended to animate the gun, does not do any damage - } + sound (self, CHAN_WEAPON, "weapons/grabber_melee.wav", VOL_BASE, ATTN_NORM); if(random() < cvar("g_balance_vore_kick_escapeprobability")) Vore_Regurgitate(self); diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc index b62ba3ba..1de3ecfd 100644 --- 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 precache_sound ("weapons/grabber_fire.wav"); precache_sound ("weapons/grabber_altfire.wav"); + precache_sound ("weapons/grabber_melee.wav"); precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP)