Rename WR_PRECACHE to WR_INIT, which is more appropriate

diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh
index 2719cec707d9e97f185e197033df9e2d8974d52e..23d8d0a9a23dfbf3f25bebbcf99bca9576b19620 100644 (file)
--- a/qcsrc/common/weapons/config.qh
+++ b/qcsrc/common/weapons/config.qh
@@ -13,36 +13,36 @@ float wep_config_alsoprint;
 #define WEP_CONFIG_WRITE_CVARS(weapon,mode,name) \
        #if mode == MO_PRI \
                { WEP_CONFIG_WRITE(sprintf( \
-                       "set g_balance_%s_primary_%s %f\n", \
+                       "set g_balance_%s_primary_%s %g\n", \
                        #weapon, \
                        #name, \
                        autocvar_g_balance_##weapon##_primary_##name)) } \
        #endif \
        #if mode == MO_SEC \
-               { WEP_CONFIG_WRITE(sprintf("set g_balance_%s_secondary_%s %f\n", \
+               { WEP_CONFIG_WRITE(sprintf("set g_balance_%s_secondary_%s %g\n", \
                        #weapon, \
                        #name, \
                        autocvar_g_balance_##weapon##_secondary_##name)) } \
        #endif \
        #if mode == MO_BOTH \
-               { WEP_CONFIG_WRITE(sprintf("set g_balance_%s_primary_%s %f\n", \
+               { WEP_CONFIG_WRITE(sprintf("set g_balance_%s_primary_%s %g\n", \
                        #weapon, \
                        #name, \
                        autocvar_g_balance_##weapon##_primary_##name)) } \
-               { WEP_CONFIG_WRITE(sprintf("set g_balance_%s_secondary_%s %f\n", \
+               { WEP_CONFIG_WRITE(sprintf("set g_balance_%s_secondary_%s %g\n", \
                        #weapon, \
                        #name, \
                        autocvar_g_balance_##weapon##_secondary_##name)) } \
        #endif \
        #if mode == MO_NONE \
-               { WEP_CONFIG_WRITE(sprintf("set g_balance_%s_%s %f\n", \
+               { WEP_CONFIG_WRITE(sprintf("set g_balance_%s_%s %g\n", \
                        #weapon, \
                        #name, \
                        autocvar_g_balance_##weapon##_##name)) } \
        #endif
        
 #define WEP_CONFIG_WRITE_PROPS(weapon,prop,name) \
-       { WEP_CONFIG_WRITE(sprintf("set g_balance_%s_%s %f\n", \
+       { WEP_CONFIG_WRITE(sprintf("set g_balance_%s_%s %g\n", \
                        #weapon, \
                        #name, \
                        autocvar_g_balance_##weapon##_##name)) } 

diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc
index 1be09717e1962f0fb9151463fd0737f05c46e14b..62d6c68b9b0a91b468667beb3e51c1f55bd957b8 100644 (file)
--- a/qcsrc/common/weapons/w_arc.qc
+++ b/qcsrc/common/weapons/w_arc.qc
@@ -236,7 +236,7 @@ float w_arc(float req)
                                
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/weapons/g_arc.md3");
                        precache_model ("models/weapons/v_arc.md3");
@@ -287,7 +287,7 @@ float w_arc(float req)
 
 void ArcInit()
 {
-       WEP_ACTION(WEP_ARC, WR_PRECACHE);
+       WEP_ACTION(WEP_ARC, WR_INIT);
        arc_shotorigin[0] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), FALSE, FALSE, 1);
        arc_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), FALSE, FALSE, 2);
        arc_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), FALSE, FALSE, 3);
@@ -325,7 +325,7 @@ float w_arc(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/arc_impact.wav");
                        precache_sound("weapons/arc_impact_combo.wav");

diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc
index 0221e0649bfe7c8a564c55ef56ac706cd1c47b22..1f2a49c26234412b66d0ff5356d58374c1b1cc49 100644 (file)
--- a/qcsrc/common/weapons/w_blaster.qc
+++ b/qcsrc/common/weapons/w_blaster.qc
@@ -503,7 +503,7 @@ float W_Laser(float request)
                        return TRUE;
                }
                
-               case WR_PRECACHE: 
+               case WR_INIT: 
                {
                        precache_model("models/weapons/g_laser.md3");
                        precache_model("models/weapons/v_laser.md3");
@@ -559,7 +559,7 @@ float W_Laser(float request)
                        return TRUE;
                }
                
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/laserimpact.wav");
                        return TRUE;

diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc
index acc66393a50208f53b3b3973df748385ef96174c..b634d3a922e21c1493ccbd76a744c05af08e6781 100644 (file)
--- a/qcsrc/common/weapons/w_crylink.qc
+++ b/qcsrc/common/weapons/w_crylink.qc
@@ -627,7 +627,7 @@ float w_crylink(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/weapons/g_crylink.md3");
                        precache_model ("models/weapons/v_crylink.md3");
@@ -709,7 +709,7 @@ float w_crylink(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/crylink_impact2.wav");
                        precache_sound("weapons/crylink_impact.wav");

diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc
index 10ca7528f91b0af52563694540ca0196f72d60e2..292dfb8623c8d187eea1d3f9d827b0cd22a325b7 100644 (file)
--- a/qcsrc/common/weapons/w_devastator.qc
+++ b/qcsrc/common/weapons/w_devastator.qc
@@ -451,7 +451,7 @@ float W_Devastator(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        if(autocvar_sv_precacheweapons)
                        {
@@ -550,7 +550,7 @@ float W_Devastator(float req)
                                
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/rocket_impact.wav");
                        return TRUE;

diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc
index a176070624c3a7ea85656649796df7992fcda3f3..0830d2d9252caa9c58a2c92c09c35f809798dc56 100644 (file)
--- a/qcsrc/common/weapons/w_electro.qc
+++ b/qcsrc/common/weapons/w_electro.qc
@@ -368,7 +368,7 @@ void W_Electro_Attack3 (void)
 
 void ElectroInit()
 {
-       WEP_ACTION(WEP_ELECTRO, WR_PRECACHE);
+       WEP_ACTION(WEP_ELECTRO, WR_INIT);
        electro_shotorigin[0] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), FALSE, FALSE, 1);
        electro_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), FALSE, FALSE, 2);
        electro_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), FALSE, FALSE, 3);
@@ -504,7 +504,7 @@ float w_electro(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/weapons/g_electro.md3");
                        precache_model ("models/weapons/v_electro.md3");
@@ -626,7 +626,7 @@ float w_electro(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/electro_impact.wav");
                        precache_sound("weapons/electro_impact_combo.wav");

diff --git a/qcsrc/common/weapons/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc
index f68050f383c7ecf089ed96cdffc8677360d1cc78..0c698f3c998b60129026b56497994dadac1bcde5 100644 (file)
--- a/qcsrc/common/weapons/w_fireball.qc
+++ b/qcsrc/common/weapons/w_fireball.qc
@@ -358,7 +358,7 @@ float w_fireball(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/weapons/g_fireball.md3");
                        precache_model ("models/weapons/v_fireball.md3");
@@ -425,7 +425,7 @@ float w_fireball(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/fireball_impact2.wav");
                        return TRUE;

diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc
index 96277ef240dc9f5a3bbcbe8dc68ab1ff915146e9..cb1d1719061e0f7f9999e0f314321a3ded1c23d3 100644 (file)
--- a/qcsrc/common/weapons/w_hagar.qc
+++ b/qcsrc/common/weapons/w_hagar.qc
@@ -435,7 +435,7 @@ float w_hagar(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/weapons/g_hagar.md3");
                        precache_model ("models/weapons/v_hagar.md3");
@@ -533,7 +533,7 @@ float w_hagar(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/hagexp1.wav");
                        precache_sound("weapons/hagexp2.wav");

diff --git a/qcsrc/common/weapons/w_hlac.qc b/qcsrc/common/weapons/w_hlac.qc
index c47b1c6da7654ba69eff2291e48a87de381a59d7..4979ebc7635316d7b513e5923d0633eaf79640fb 100644 (file)
--- a/qcsrc/common/weapons/w_hlac.qc
+++ b/qcsrc/common/weapons/w_hlac.qc
@@ -202,7 +202,7 @@ float w_hlac(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/weapons/g_hlac.md3");
                        precache_model ("models/weapons/v_hlac.md3");
@@ -260,7 +260,7 @@ float w_hlac(float req)
                                
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/laserimpact.wav");
                        return TRUE;

diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc
index ae0f756d49d0514895c05d00e0a434d15c06f1e3..7abf7bc8b270e7f90056273ca3b6fab02fd80f59 100644 (file)
--- a/qcsrc/common/weapons/w_hook.qc
+++ b/qcsrc/common/weapons/w_hook.qc
@@ -250,7 +250,7 @@ float w_hook(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/weapons/g_hookgun.md3");
                        precache_model ("models/weapons/v_hookgun.md3");
@@ -310,7 +310,7 @@ float w_hook(float req)
                                
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/hookbomb_impact.wav");
                        return TRUE;

diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc
index 2b92a8da99033e6033c3679ec38f153c72ebce97..c3bade0750a504c1e5f6ae635c2d30319d3533b2 100644 (file)
--- a/qcsrc/common/weapons/w_machinegun.qc
+++ b/qcsrc/common/weapons/w_machinegun.qc
@@ -297,7 +297,7 @@ float w_uzi(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/uziflash.md3");
                        precache_model ("models/weapons/g_uzi.md3");
@@ -389,7 +389,7 @@ float w_uzi(float req)
                                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/ric1.wav");
                        precache_sound("weapons/ric2.wav");

diff --git a/qcsrc/common/weapons/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc
index d6dc2650880689fb18e2ddd2118fe40d60767cf7..f1af7885c934a8575b3455d2541b3dc9ab3586f8 100644 (file)
--- a/qcsrc/common/weapons/w_minelayer.qc
+++ b/qcsrc/common/weapons/w_minelayer.qc
@@ -493,7 +493,7 @@ float w_minelayer(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/flash.md3");
                        precache_model ("models/mine.md3");
@@ -567,7 +567,7 @@ float w_minelayer(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/mine_exp.wav");
                        return TRUE;

diff --git a/qcsrc/common/weapons/w_minstanex.qc b/qcsrc/common/weapons/w_minstanex.qc
index d409ac20878d90f435ac8036f0c55e3573592b3a..7ea60dab3bd6383c96df380c08aa7b91a27f0fc8 100644 (file)
--- a/qcsrc/common/weapons/w_minstanex.qc
+++ b/qcsrc/common/weapons/w_minstanex.qc
@@ -145,7 +145,7 @@ float w_minstanex(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/nexflash.md3");
                        precache_model ("models/weapons/g_minstanex.md3");
@@ -155,7 +155,7 @@ float w_minstanex(float req)
                        precache_sound ("weapons/nexwhoosh1.wav");
                        precache_sound ("weapons/nexwhoosh2.wav");
                        precache_sound ("weapons/nexwhoosh3.wav");
-                       W_Laser(WR_PRECACHE);
+                       W_Laser(WR_INIT);
                        return TRUE;
                }
                case WR_SETUP:
@@ -222,7 +222,7 @@ float w_minstanex(float req)
                                
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/neximpact.wav");
                        return TRUE;

diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc
index aa72c88e6f107213b2c44a9192026f4b8fcca448..f6bdc9e9b62066a803562cc0595060be1a10d9f2 100644 (file)
--- a/qcsrc/common/weapons/w_mortar.qc
+++ b/qcsrc/common/weapons/w_mortar.qc
@@ -373,7 +373,7 @@ float w_glauncher(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/weapons/g_gl.md3");
                        precache_model ("models/weapons/v_gl.md3");
@@ -450,7 +450,7 @@ float w_glauncher(float req)
                                
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/grenade_impact.wav");
                        return TRUE;

diff --git a/qcsrc/common/weapons/w_nex.qc b/qcsrc/common/weapons/w_nex.qc
index 821f9e2ecf6de4a5798129f38a7cc79a0aec03a2..5e9a3e2a4f23b19b8b77cda85336abd3066efefb 100644 (file)
--- a/qcsrc/common/weapons/w_nex.qc
+++ b/qcsrc/common/weapons/w_nex.qc
@@ -230,7 +230,7 @@ float w_nex(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/nexflash.md3");
                        precache_model ("models/weapons/g_nex.md3");
@@ -306,7 +306,7 @@ float w_nex(float req)
                                
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/neximpact.wav");
                        return TRUE;

diff --git a/qcsrc/common/weapons/w_porto.qc b/qcsrc/common/weapons/w_porto.qc
index 093757b23814255726c2aad951b45e901f284972..0c4c71ccec8e5db0274833418ba3042b80e8cd38 100644 (file)
--- a/qcsrc/common/weapons/w_porto.qc
+++ b/qcsrc/common/weapons/w_porto.qc
@@ -356,7 +356,7 @@ float w_porto(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/weapons/g_porto.md3");
                        precache_model ("models/weapons/v_porto.md3");
@@ -395,7 +395,7 @@ float w_porto(float req)
                        print("Since when does Porto send DamageInfo?\n");
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        // nothing to do
                        return TRUE;

diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc
index a3fac999b956bfbf4db94c3a18b574a8d1ab87da..065301469d29986055d594c71f185e44927a2f6f 100644 (file)
--- a/qcsrc/common/weapons/w_rifle.qc
+++ b/qcsrc/common/weapons/w_rifle.qc
@@ -182,7 +182,7 @@ float w_rifle(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/weapons/g_campingrifle.md3");
                        precache_model ("models/weapons/v_campingrifle.md3");
@@ -266,7 +266,7 @@ float w_rifle(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/ric1.wav");
                        precache_sound("weapons/ric2.wav");

diff --git a/qcsrc/common/weapons/w_seeker.qc b/qcsrc/common/weapons/w_seeker.qc
index 091ce32f7bd3ef80c55b08c95301e0846819d0cb..2118b6ebd47d5bcc84e7cd8127029402026bfea3 100644 (file)
--- a/qcsrc/common/weapons/w_seeker.qc
+++ b/qcsrc/common/weapons/w_seeker.qc
@@ -598,7 +598,7 @@ float w_seeker(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/weapons/g_seeker.md3");
                        precache_model ("models/weapons/v_seeker.md3");
@@ -710,7 +710,7 @@ float w_seeker(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/seekerexp1.wav");
                        precache_sound("weapons/seekerexp2.wav");

diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc
index 61f4c7227796a0a5e931b4ab5cffcfb61952c587..74572136206ab1d55edb0164e7d99baa93916f7d 100644 (file)
--- a/qcsrc/common/weapons/w_shockwave.qc
+++ b/qcsrc/common/weapons/w_shockwave.qc
@@ -236,7 +236,7 @@ float w_shotgun(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/uziflash.md3");
                        precache_model ("models/weapons/g_shotgun.md3");
@@ -307,7 +307,7 @@ float w_shotgun(float req)
                        }
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/ric1.wav");
                        precache_sound("weapons/ric2.wav");

diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc
index 3905df22328d34f2aeb4013d88c3651d657fb95b..e97eaef7f40a988d24d6ae4d95508679c35593be 100644 (file)
--- a/qcsrc/common/weapons/w_tuba.qc
+++ b/qcsrc/common/weapons/w_tuba.qc
@@ -389,7 +389,7 @@ float w_tuba(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/weapons/g_tuba.md3");
                        precache_model ("models/weapons/v_tuba.md3");

diff --git a/qcsrc/common/weapons/weapons.qc b/qcsrc/common/weapons/weapons.qc
index 4ed0549b53d8b949a744edd6b6b2b6b0b795c4d3..72c081be9b796e161234b920dc53a36f4ce89703 100644 (file)
--- a/qcsrc/common/weapons/weapons.qc
+++ b/qcsrc/common/weapons/weapons.qc
@@ -38,7 +38,7 @@ void register_weapon(float id, float(float) func, float ammotype, float i, float
                e.ammo_field = ammo_batteries;
 
        #ifndef MENUQC
-       func(WR_PRECACHE);
+       func(WR_INIT);
        #endif
 }
 float w_null(float dummy)

diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh
index d59bf7a4dad33c1dfe41fcf45e7257455aa370d7..cc57d7ed73172c3a2ba9e06e6f358cad412b9d08 100644 (file)
--- a/qcsrc/common/weapons/weapons.qh
+++ b/qcsrc/common/weapons/weapons.qh
@@ -25,7 +25,7 @@ float WR_THINK                = 2; // (SVQC) logic to run every frame
 float WR_CHECKAMMO1    = 3; // (SVQC) checks ammo for weapon
 float WR_CHECKAMMO2    = 4; // (SVQC) checks ammo for weapon
 float WR_AIM           = 5; // (SVQC) runs bot aiming code for this weapon
-float WR_PRECACHE      = 6; // (CSQC and SVQC) precaches models/sounds used by this weapon
+float WR_INIT  = 6; // (CSQC and SVQC) precaches models/sounds used by this weapon
 float WR_SUICIDEMESSAGE = 7; // (SVQC) notification number for suicide message (may inspect w_deathtype for details)
 float WR_KILLMESSAGE    = 8; // (SVQC) notification number for kill message (may inspect w_deathtype for details)
 float WR_RELOAD         = 9; // (SVQC) does not need to do anything

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index ff7adce239892f8ac2eea2f08fd34761b6a45046..9164ba57dcd20797b2c9de4d0d65b8255a77949c 100644 (file)
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -475,7 +475,7 @@ void GrappleHookInit()
        }
        else
        {
-               WEP_ACTION(WEP_HOOK, WR_PRECACHE);
+               WEP_ACTION(WEP_HOOK, WR_INIT);
                hook_shotorigin[0] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK), FALSE, FALSE, 1);
                hook_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK), FALSE, FALSE, 2);
                hook_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK), FALSE, FALSE, 3);

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 2e9bd616cce7ccce524aa43127396117672e066d..fd9520fe8c8564706d21b830aa340a2da9ea7aa0 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -866,7 +866,7 @@ void readplayerstartcvars()
        {
                e = get_weaponinfo(i);
                if(WEPSET_CONTAINS_AW(start_weapons, i) || WEPSET_CONTAINS_AW(warmup_start_weapons, i))
-                       WEP_ACTION(i, WR_PRECACHE);
+                       WEP_ACTION(i, WR_INIT);
        }
 
        start_ammo_shells = max(0, start_ammo_shells);

diff --git a/qcsrc/server/mutators/gamemode_nexball.qc b/qcsrc/server/mutators/gamemode_nexball.qc
index 4f6e3d034e9d4c6d9261e0af2d1b1529d0c7b92a..d6dc52fbe895f35add2beb119f80d33a76b45e80 100644 (file)
--- a/qcsrc/server/mutators/gamemode_nexball.qc
+++ b/qcsrc/server/mutators/gamemode_nexball.qc
@@ -833,7 +833,7 @@ float w_nexball_weapon(float req)
                        weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_nexball_primary_animtime, w_ready);
                }
        }
-       else if(req == WR_PRECACHE)
+       else if(req == WR_INIT)
        {
                precache_model("models/weapons/g_porto.md3");
                precache_model("models/weapons/v_porto.md3");

diff --git a/qcsrc/server/mutators/mutator_nix.qc b/qcsrc/server/mutators/mutator_nix.qc
index 33a37c8fb08678013d45bc4d98ae7bf3af220c40..44ff71749cca4355a2ef8f44a30baa5f1cf41aeb 100644 (file)
--- a/qcsrc/server/mutators/mutator_nix.qc
+++ b/qcsrc/server/mutators/mutator_nix.qc
@@ -60,7 +60,7 @@ void NIX_GiveCurrentWeapon()
                        nix_nextchange = time; // start the first round now!
                else
                        nix_nextchange = time + autocvar_g_balance_nix_roundtime;
-               //WEP_ACTION(nix_weapon, WR_PRECACHE); // forget it, too slow
+               //WEP_ACTION(nix_weapon, WR_INIT); // forget it, too slow
        }
 
        if(nix_nextchange != self.nix_lastchange_id) // this shall only be called once per round!
@@ -152,7 +152,7 @@ void NIX_precache()
        float i;
        for (i = WEP_FIRST; i <= WEP_LAST; ++i)
                if (NIX_CanChooseWeapon(i))
-                       WEP_ACTION(i, WR_PRECACHE);
+                       WEP_ACTION(i, WR_INIT);
 }
 
 MUTATOR_HOOKFUNCTION(nix_ForbidThrowCurrentWeapon)

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 6600a1558c08c87454c3c44a18fac07b88b6ddd7..5b87bc07f2e35895737aea4b9d66e82b0f940bd7 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -1373,7 +1373,7 @@ void spawnfunc_target_items (void)
                                        {
                                                WEPSET_OR_EW(self, j);
                                                if(self.spawnflags == 0 || self.spawnflags == 2)
-                                                       WEP_ACTION(e.weapon, WR_PRECACHE);
+                                                       WEP_ACTION(e.weapon, WR_INIT);
                                                break;
                                        }
                                }
@@ -1445,7 +1445,7 @@ void spawnfunc_target_items (void)
                        e = get_weaponinfo(j);
                        if(argv(i) == e.netname)
                        {
-                               WEP_ACTION(e.weapon, WR_PRECACHE);
+                               WEP_ACTION(e.weapon, WR_INIT);
                                break;
                        }
                }
@@ -1771,7 +1771,7 @@ float GiveItems(entity e, float beginarg, float endarg)
                        POSTGIVE_WEAPON(e, j, "weapons/weaponpickup.wav", string_null);
                        if not(WEPSET_CONTAINS_AW(save_weapons, j))
                                if(WEPSET_CONTAINS_EW(e, j))
-                                       WEP_ACTION(wi.weapon, WR_PRECACHE);
+                                       WEP_ACTION(wi.weapon, WR_INIT);
                }
        }
        POSTGIVE_VALUE(e, strength_finished, 1, "misc/powerup.wav", "misc/poweroff.wav");

diff --git a/qcsrc/server/weapons/cl_weapons.qc b/qcsrc/server/weapons/cl_weapons.qc
index 17475ffb8618c6861adc8a3adee9f3104d562259..327d490e7db95fb64aa5446b2f33a3fece130054 100644 (file)
--- a/qcsrc/server/weapons/cl_weapons.qc
+++ b/qcsrc/server/weapons/cl_weapons.qc
@@ -662,5 +662,5 @@ void weapon_defaultspawnfunc(float wpn)
 
        StartItem(e.model, "weapons/weaponpickup.wav", self.respawntime, self.respawntimejitter, e.message, 0, e.weapon, f, weapon_pickupevalfunc, e.bot_pickupbasevalue);
        if (self.modelindex) // don't precache if self was removed
-               WEP_ACTION(e.weapon, WR_PRECACHE);
+               WEP_ACTION(e.weapon, WR_INIT);
 }