From: Rudolf Polzer Date: Tue, 19 Oct 2010 05:42:06 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/fruitiex/outofammosound' X-Git-Tag: xonotic-v0.1.0preview~284 X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=c411540140fa2a0763fe23c38957dbd75afb1e05;hp=71bf8a752df0b2a0dc2f9476691525d0631b1238;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'refs/remotes/origin/fruitiex/outofammosound' --- diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index 9e1eedae0..4537573c5 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -1117,6 +1117,9 @@ float weapon_prepareattack_checkammo(float secondary) for(mine = world; (mine = find(mine, classname, "mine")); ) if(mine.owner == self) return FALSE; + if(self.weapon == self.switchweapon) // only play once BEFORE starting to switch weapons + sound (self, CHAN_AUTO, "weapons/dryfire.wav", VOL_BASE, ATTN_NORM); + W_SwitchToOtherWeapon(self); return FALSE; } diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index d42324240..59428f65d 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -1668,6 +1668,7 @@ void precache() precache_sound ("weapons/weapon_switch.wav"); precache_sound ("weapons/weaponpickup.wav"); precache_sound ("weapons/unavailable.wav"); + precache_sound ("weapons/dryfire.wav"); if (g_grappling_hook) { precache_sound ("weapons/hook_fire.wav"); // hook diff --git a/sound/weapons/dryfire.wav b/sound/weapons/dryfire.wav new file mode 100644 index 000000000..81e86b19d Binary files /dev/null and b/sound/weapons/dryfire.wav differ