From 7dd33d95c490d3f51197996d22b42057834be561 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Tue, 1 Mar 2011 01:53:19 +0200 Subject: [PATCH 1/1] The unavailable.wav sound is only located in misc/, not weapons/ (as it addresses many things) --- data/qcsrc/server/cl_weaponsystem.qc | 4 ++-- data/qcsrc/server/miscfunctions.qc | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index 2b06fed1..004442c9 100644 --- a/data/qcsrc/server/cl_weaponsystem.qc +++ b/data/qcsrc/server/cl_weaponsystem.qc @@ -996,7 +996,7 @@ float weapon_prepareattack_checkammo(float secondary) { if(self.weapon == self.switchweapon && time - self.prevdryfire > 1) // only play once BEFORE starting to switch weapons { - sound (self, CHAN_AUTO, "weapons/unavailable.wav", VOL_BASE, ATTN_NORM); + sound (self, CHAN_AUTO, "misc/unavailable.wav", VOL_BASE, ATTN_NORM); self.prevdryfire = time; } @@ -1594,7 +1594,7 @@ float W_ReloadCheck() { if(clienttype(self) == CLIENTTYPE_REAL && self.reload_complain < time) { - play2(self, "weapons/unavailable.wav"); + play2(self, "misc/unavailable.wav"); sprint(self, strcat("You don't have enough ammo to reload the ^2", W_Name(self.weapon), "\n")); self.reload_complain = time + 1; } diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index db7de655..bf8aaedf 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -1442,7 +1442,6 @@ void precache() // common weapon precaches precache_sound ("weapons/weapon_switch.wav"); precache_sound ("weapons/weaponpickup.wav"); - precache_sound ("weapons/unavailable.wav"); precache_sound ("weapons/grabber_fire.wav"); // grabber precache_sound ("weapons/grabber_altfire.wav"); // grabber precache_sound ("weapons/grabber_impact.wav"); // grabber -- 2.39.2