From 4b153261e4228759150f12228602a1e8002f22ea Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Sat, 22 Jan 2011 19:15:57 +0200 Subject: [PATCH] Small fix and precaches --- qcsrc/server/w_crylink.qc | 1 + qcsrc/server/w_electro.qc | 1 + qcsrc/server/w_fireball.qc | 1 + qcsrc/server/w_grenadelauncher.qc | 1 + qcsrc/server/w_hagar.qc | 1 + qcsrc/server/w_hlac.qc | 1 + qcsrc/server/w_laser.qc | 1 + qcsrc/server/w_minelayer.qc | 1 + qcsrc/server/w_minstanex.qc | 1 + qcsrc/server/w_nex.qc | 2 ++ qcsrc/server/w_rocketlauncher.qc | 1 + qcsrc/server/w_seeker.qc | 1 + qcsrc/server/w_uzi.qc | 1 + 13 files changed, 14 insertions(+) diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index 7e463f56b..adfe3e25b 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -672,6 +672,7 @@ float w_crylink(float req) precache_sound ("weapons/crylink_fire.wav"); precache_sound ("weapons/crylink_fire2.wav"); precache_sound ("weapons/crylink_linkjoin.wav"); + precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) { diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index c4cd72689..4e12ffda3 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -550,6 +550,7 @@ float w_electro(float req) precache_sound ("weapons/electro_fire2.wav"); precache_sound ("weapons/electro_impact.wav"); precache_sound ("weapons/electro_impact_combo.wav"); + precache_sound ("weapons/reload.wav"); if(autocvar_g_balance_electro_lightning) { precache_sound ("weapons/lgbeam_fire.wav"); diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc index 91c104fba..3130a9303 100644 --- a/qcsrc/server/w_fireball.qc +++ b/qcsrc/server/w_fireball.qc @@ -443,6 +443,7 @@ float w_fireball(float req) precache_sound ("weapons/fireball_fire.wav"); precache_sound ("weapons/fireball_fire2.wav"); precache_sound ("weapons/fireball_prefire2.wav"); + precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) { diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index d01194b0b..569916206 100644 --- a/qcsrc/server/w_grenadelauncher.qc +++ b/qcsrc/server/w_grenadelauncher.qc @@ -415,6 +415,7 @@ float w_glauncher(float req) precache_sound ("weapons/grenade_bounce6.wav"); precache_sound ("weapons/grenade_stick.wav"); precache_sound ("weapons/grenade_fire.wav"); + precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) { diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index 2d05b285a..be2b0241b 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -239,6 +239,7 @@ float w_hagar(float req) precache_model ("models/weapons/v_hagar.md3"); precache_model ("models/weapons/h_hagar.iqm"); precache_sound ("weapons/hagar_fire.wav"); + precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) { diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc index 3a5ff0717..006c4d3ba 100644 --- a/qcsrc/server/w_hlac.qc +++ b/qcsrc/server/w_hlac.qc @@ -277,6 +277,7 @@ float w_hlac(float req) precache_model ("models/weapons/v_hlac.md3"); precache_model ("models/weapons/h_hlac.iqm"); precache_sound ("weapons/lasergun_fire.wav"); + precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc index 05542ee6a..0e23c6b40 100644 --- a/qcsrc/server/w_laser.qc +++ b/qcsrc/server/w_laser.qc @@ -338,6 +338,7 @@ float w_laser(float req) precache_model ("models/weapons/h_laser.iqm"); precache_sound ("weapons/lasergun_fire.wav"); precache_sound ("weapons/gauntlet_fire.wav"); + precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) { diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc index 2f1bbfa3b..362e93556 100644 --- a/qcsrc/server/w_minelayer.qc +++ b/qcsrc/server/w_minelayer.qc @@ -479,6 +479,7 @@ float w_minelayer(float req) precache_sound ("weapons/mine_fire.wav"); precache_sound ("weapons/mine_stick.wav"); precache_sound ("weapons/mine_trigger.wav"); + precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) { diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index 207d1d716..3a5d6f5e6 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -317,6 +317,7 @@ float w_minstanex(float req) precache_sound ("weapons/nexwhoosh1.wav"); precache_sound ("weapons/nexwhoosh2.wav"); precache_sound ("weapons/nexwhoosh3.wav"); + precache_sound ("weapons/reload.wav"); w_laser(WR_PRECACHE); } else if (req == WR_SETUP) diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc index 0eb8cc038..7abde095f 100644 --- a/qcsrc/server/w_nex.qc +++ b/qcsrc/server/w_nex.qc @@ -219,6 +219,7 @@ float w_nex(float req) { self.clip_load = max(autocvar_g_balance_nex_secondary_ammo, self.clip_load - autocvar_g_balance_nex_secondary_ammo * dt); } + self.nex_load = self.clip_load; } else { @@ -289,6 +290,7 @@ float w_nex(float req) precache_sound ("weapons/nexwhoosh1.wav"); precache_sound ("weapons/nexwhoosh2.wav"); precache_sound ("weapons/nexwhoosh3.wav"); + precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) { diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc index d38eaaf00..96a4f0b15 100644 --- a/qcsrc/server/w_rocketlauncher.qc +++ b/qcsrc/server/w_rocketlauncher.qc @@ -518,6 +518,7 @@ float w_rlauncher(float req) precache_sound ("weapons/rocket_det.wav"); precache_sound ("weapons/rocket_fire.wav"); precache_sound ("weapons/rocket_mode.wav"); + precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) { diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc index e251ace9b..f69a38cbc 100644 --- a/qcsrc/server/w_seeker.qc +++ b/qcsrc/server/w_seeker.qc @@ -540,6 +540,7 @@ float w_seeker(float req) precache_sound ("weapons/tag_fire.wav"); precache_sound ("weapons/flac_fire.wav"); precache_sound ("weapons/seeker_fire.wav"); + precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) { diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc index a02175884..761fc437a 100644 --- a/qcsrc/server/w_uzi.qc +++ b/qcsrc/server/w_uzi.qc @@ -322,6 +322,7 @@ float w_uzi(float req) precache_model ("models/weapons/v_uzi.md3"); precache_model ("models/weapons/h_uzi.iqm"); precache_sound ("weapons/uzi_fire.wav"); + precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) { -- 2.39.2