From: Samual Lenks Date: Sun, 30 Jun 2013 04:00:43 +0000 (-0400) Subject: Rename WR_PRECACHE to WR_INIT, which is more appropriate X-Git-Tag: xonotic-v0.8.0~152^2~367 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=036ae8fdbc2cfad6331dbc249e6fa3c29e6f9b29;p=xonotic%2Fxonotic-data.pk3dir.git 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 2719cec70..23d8d0a9a 100644 --- 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 1be09717e..62d6c68b9 100644 --- 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 0221e0649..1f2a49c26 100644 --- 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 acc66393a..b634d3a92 100644 --- 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 10ca7528f..292dfb862 100644 --- 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 a17607062..0830d2d92 100644 --- 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 f68050f38..0c698f3c9 100644 --- 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 96277ef24..cb1d17190 100644 --- 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 c47b1c6da..4979ebc76 100644 --- 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 ae0f756d4..7abf7bc8b 100644 --- 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 2b92a8da9..c3bade075 100644 --- 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 d6dc26508..f1af7885c 100644 --- 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 d409ac208..7ea60dab3 100644 --- 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 aa72c88e6..f6bdc9e9b 100644 --- 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 821f9e2ec..5e9a3e2a4 100644 --- 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 093757b23..0c4c71cce 100644 --- 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 a3fac999b..065301469 100644 --- 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 091ce32f7..2118b6ebd 100644 --- 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 61f4c7227..745721362 100644 --- 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 3905df223..e97eaef7f 100644 --- 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 4ed0549b5..72c081be9 100644 --- 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 d59bf7a4d..cc57d7ed7 100644 --- 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 ff7adce23..9164ba57d 100644 --- 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 2e9bd616c..fd9520fe8 100644 --- 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 4f6e3d034..d6dc52fbe 100644 --- 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 33a37c8fb..44ff71749 100644 --- 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 6600a1558..5b87bc07f 100644 --- 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 17475ffb8..327d490e7 100644 --- 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); }