Small fix and precaches

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index 7e463f56b664c4d5bc36813b202796ca0c7e459b..adfe3e25ba6347ebefa4ff5d3eef929e0d0b22fb 100644 (file)
--- 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 c4cd72689843646e50a916b660850d4fc7215131..4e12ffda3db30cd9707c42d4f72370e50a1f789d 100644 (file)
--- 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 91c104fba9e5885133925594cdaaf67d4134703d..3130a930397627c5dba1aa5e03e09f81f39ce87f 100644 (file)
--- 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 d01194b0bde43044a9ee1c8f00baa1d040cc9703..56991620684e673d775eee7d133beaa66dfbb77a 100644 (file)
--- 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 2d05b285a683568dd9e518fbcf5f56d07720e1c5..be2b0241bc28eec963632d6ccff698edb77e66e1 100644 (file)
--- 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 3a5ff0717cb203d313ca57929b1190cb7642950d..006c4d3ba260a120b4e96cd69e7a36166eed3105 100644 (file)
--- 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 05542ee6aba0328fdc4067ece1a32984f6e65201..0e23c6b401999c73f9b77bad417bc2c1afc6fa2e 100644 (file)
--- 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 2f1bbfa3b375d0f4a0dda08918f0625ab18a6e99..362e9355687de4d1c8b5190fb5ccd8bed808cd03 100644 (file)
--- 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 207d1d71648cfd97fc2d75090bb6b34805f43964..3a5d6f5e680813fe31a80ec5025d988a917981b5 100644 (file)
--- 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 0eb8cc038cae715174ccb402e896b81cfd2ed3f0..7abde095f299c7946ce0a64bff3d0cce9bd65c53 100644 (file)
--- 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 d38eaaf002aa5d59d47abd802a9562ab1d803c78..96a4f0b15f4ee8caa3734759e912f86f6e6cdbf6 100644 (file)
--- 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 e251ace9b31411a563aaf5d1b0be69b676b26f05..f69a38cbcda16ce347c8b34ad1f5c16d8402d8b2 100644 (file)
--- 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 a02175884d9f9dd1c76272e2586ffede03600e18..761fc437ac2ac4ae5224d30b445455fd3452218f 100644 (file)
--- 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)
        {