From 79391877b6c1a9b898b2e961d4ef2e469b7d03a9 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Fri, 21 Jan 2011 19:29:34 +0200 Subject: [PATCH] Rename the sound file, as it no longer belongs to one weapon only. Currently, all weapons will use the same reload sound, but that can easily be changed later. --- qcsrc/server/w_shotgun.qc | 3 ++- qcsrc/server/w_sniperrifle.qc | 4 ++-- .../weapons/{campingrifle_reload.ogg => reload.ogg} | Bin 3 files changed, 4 insertions(+), 3 deletions(-) rename sound/weapons/{campingrifle_reload.ogg => reload.ogg} (100%) diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index f28bc03f8..4f443b24a 100644 --- a/qcsrc/server/w_shotgun.qc +++ b/qcsrc/server/w_shotgun.qc @@ -43,7 +43,7 @@ void W_Shotgun_Reload() float t; - sound (self, CHAN_WEAPON2, "weapons/campingrifle_reload.wav", VOL_BASE, ATTN_NORM); + sound (self, CHAN_WEAPON2, "weapons/reload.wav", VOL_BASE, ATTN_NORM); t = max(time, ATTACK_FINISHED(self)) + autocvar_g_balance_shotgun_reload_time + 1; ATTACK_FINISHED(self) = t; @@ -217,6 +217,7 @@ float w_shotgun(float req) precache_sound ("misc/itempickup.wav"); precache_sound ("weapons/shotgun_fire.wav"); precache_sound ("weapons/shotgun_melee.wav"); + precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) { diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc index 5c6b49c0b..eb6efb86f 100644 --- a/qcsrc/server/w_sniperrifle.qc +++ b/qcsrc/server/w_sniperrifle.qc @@ -47,7 +47,7 @@ void W_SniperRifle_Reload() float t; - sound (self, CHAN_WEAPON2, "weapons/campingrifle_reload.wav", VOL_BASE, ATTN_NORM); + sound (self, CHAN_WEAPON2, "weapons/reload.wav", VOL_BASE, ATTN_NORM); t = max(time, ATTACK_FINISHED(self)) + autocvar_g_balance_sniperrifle_reload_time + 1; ATTACK_FINISHED(self) = t; @@ -245,9 +245,9 @@ float w_sniperrifle(float req) precache_model ("models/weapons/g_campingrifle.md3"); precache_model ("models/weapons/v_campingrifle.md3"); precache_model ("models/weapons/h_campingrifle.iqm"); - precache_sound ("weapons/campingrifle_reload.wav"); precache_sound ("weapons/campingrifle_fire.wav"); precache_sound ("weapons/campingrifle_fire2.wav"); + precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) { diff --git a/sound/weapons/campingrifle_reload.ogg b/sound/weapons/reload.ogg similarity index 100% rename from sound/weapons/campingrifle_reload.ogg rename to sound/weapons/reload.ogg -- 2.39.2