From be6fd775926e5e1b2497d00caabfe650407180f5 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Tue, 11 Jul 2023 13:35:18 -0700 Subject: [PATCH 1/3] Shared: Reset shotcounters cleanly when weapons are finished reloading. --- src/server/armoury_entity.qc | 2 +- src/server/func_bomb_target.qc | 2 +- src/server/func_buyzone.qc | 2 +- src/server/func_escapezone.qc | 2 +- src/server/func_hostage_rescue.qc | 2 +- src/server/func_vip_safetyzone.qc | 2 +- src/server/hostage_entity.qc | 19 +++++++++++-------- src/server/info_buyzone.qc | 8 ++++---- src/server/info_hostage_rescue.qc | 2 +- src/server/info_map_parameters.qc | 2 +- src/shared/w_ak47.qc | 6 ++++-- src/shared/w_aug.qc | 6 ++++-- src/shared/w_awp.qc | 6 ++++-- src/shared/w_c4bomb.qc | 5 +++-- src/shared/w_deagle.qc | 6 ++++-- src/shared/w_elites.qc | 6 ++++-- src/shared/w_fiveseven.qc | 6 ++++-- src/shared/w_flashbang.qc | 8 ++++++-- src/shared/w_g3sg1.qc | 9 +++++---- src/shared/w_glock18.qc | 6 ++++-- src/shared/w_hegrenade.qc | 8 ++++++-- src/shared/w_knife.qc | 5 +++-- src/shared/w_m3.qc | 5 +++-- src/shared/w_m4a1.qc | 6 ++++-- src/shared/w_mac10.qc | 6 ++++-- src/shared/w_mp5.qc | 6 ++++-- src/shared/w_p228.qc | 6 ++++-- src/shared/w_p90.qc | 6 ++++-- src/shared/w_para.qc | 6 ++++-- src/shared/w_scout.qc | 6 ++++-- src/shared/w_sg550.qc | 6 ++++-- src/shared/w_sg552.qc | 6 ++++-- src/shared/w_smokegrenade.qc | 8 ++++++-- src/shared/w_tmp.qc | 6 ++++-- src/shared/w_ump45.qc | 6 ++++-- src/shared/w_usp45.qc | 6 ++++-- src/shared/w_xm1014.qc | 5 +++-- src/shared/weapons_cstrike.qc | 14 ++++++++++++++ zpak001.pk3dir/def/monsters.def | 0 zpak001.pk3dir/def/weapons.def | 0 40 files changed, 148 insertions(+), 76 deletions(-) create mode 100644 zpak001.pk3dir/def/monsters.def create mode 100644 zpak001.pk3dir/def/weapons.def diff --git a/src/server/armoury_entity.qc b/src/server/armoury_entity.qc index 5fb5fe5..d0148c4 100644 --- a/src/server/armoury_entity.qc +++ b/src/server/armoury_entity.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED armoury_entity (0 0 0.8) (-16 -16 0) (16 16 16) +/*!QUAKED armoury_entity (0 0 0.8) (-16 -16 0) (16 16 16) "targetname" Name "target" Target when triggered. "killtarget" Target to kill when triggered. diff --git a/src/server/func_bomb_target.qc b/src/server/func_bomb_target.qc index 7522be1..08f366e 100644 --- a/src/server/func_bomb_target.qc +++ b/src/server/func_bomb_target.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED func_bomb_target (0 .5 .8) ? +/*!QUAKED func_bomb_target (0 .5 .8) ? "targetname" Name "target" Target when bomb blows up. "killtarget" Target to kill when triggered. diff --git a/src/server/func_buyzone.qc b/src/server/func_buyzone.qc index 92e6c8c..b723694 100644 --- a/src/server/func_buyzone.qc +++ b/src/server/func_buyzone.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED func_buyzone (0 .5 .8) ? +/*!QUAKED func_buyzone (0 .5 .8) ? "targetname" Name "target" Target when triggered. "killtarget" Target to kill when triggered. diff --git a/src/server/func_escapezone.qc b/src/server/func_escapezone.qc index f99e0cb..a215988 100644 --- a/src/server/func_escapezone.qc +++ b/src/server/func_escapezone.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED func_escapezone (0 .5 .8) ? +/*!QUAKED func_escapezone (0 .5 .8) ? "targetname" Name "target" Target when triggered. "killtarget" Target to kill when triggered. diff --git a/src/server/func_hostage_rescue.qc b/src/server/func_hostage_rescue.qc index 0af8e76..ba5e17a 100644 --- a/src/server/func_hostage_rescue.qc +++ b/src/server/func_hostage_rescue.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED func_hostage_rescue (0 .5 .8) ? +/*!QUAKED func_hostage_rescue (0 .5 .8) ? "targetname" Name "target" Target when triggered. "killtarget" Target to kill when triggered. diff --git a/src/server/func_vip_safetyzone.qc b/src/server/func_vip_safetyzone.qc index 785e064..1f351a9 100644 --- a/src/server/func_vip_safetyzone.qc +++ b/src/server/func_vip_safetyzone.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED func_vip_safetyzone (0 .5 .8) ? +/*!QUAKED func_vip_safetyzone (0 .5 .8) ? "targetname" Name "target" Target when triggered. "killtarget" Target to kill when triggered. diff --git a/src/server/hostage_entity.qc b/src/server/hostage_entity.qc index 6c0ef12..a8f2efd 100644 --- a/src/server/hostage_entity.qc +++ b/src/server/hostage_entity.qc @@ -14,19 +14,22 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED hostage_entity (0 1 0) (-16 -16 0) (16 16 72) +/*!QUAKED hostage_entity (0 1 0) (-16 -16 0) (16 16 72) +# OVERVIEW +Hostage NPC. +Used in the Hostage Rescue mode (cs_* maps). + +# KEYS "targetname" Name "target" Target when triggered. "killtarget" Target to kill when triggered. -"model" "models/hostage.mdl" -"skin" "0" -COUNTER-STRIKE (1999) ENTITY - -Hostage NPC. - -Used in the Hostage Rescue mode (cs_* maps). +# TRIVIA +This entity was introduced in Counter-Strike (1999) +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/hostage.mdl" +skin="0" */ enum diff --git a/src/server/info_buyzone.qc b/src/server/info_buyzone.qc index 15242fa..8426744 100644 --- a/src/server/info_buyzone.qc +++ b/src/server/info_buyzone.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED info_buyzone (0 0 0.8) (-16 -16 0) (16 16 16) +/*!QUAKED info_buyzone (0 0 0.8) (-16 -16 0) (16 16 16) "targetname" Name "target" Target when triggered. "killtarget" Target to kill when triggered. @@ -28,10 +28,10 @@ See func_buyzone for more information. class info_buyzone:NSPointTrigger { - void(void) info_buyzone; + void info_buyzone(void); - virtual void(void) Respawn; - virtual void(entity) Touch; + virtual void Respawn(void); + virtual void Touch(entity); }; void diff --git a/src/server/info_hostage_rescue.qc b/src/server/info_hostage_rescue.qc index 6862a37..d205699 100644 --- a/src/server/info_hostage_rescue.qc +++ b/src/server/info_hostage_rescue.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED info_hostage_rescue (0 0 0.8) (-16 -16 0) (16 16 16) +/*!QUAKED info_hostage_rescue (0 0 0.8) (-16 -16 0) (16 16 16) "targetname" Name "target" Target when triggered. "killtarget" Target to kill when triggered. diff --git a/src/server/info_map_parameters.qc b/src/server/info_map_parameters.qc index 71ad849..71452bf 100644 --- a/src/server/info_map_parameters.qc +++ b/src/server/info_map_parameters.qc @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED info_map_parameters (0 0 0.8) (-16 -16 0) (16 16 16) +/*!QUAKED info_map_parameters (0 0 0.8) (-16 -16 0) (16 16 16) "targetname" Name "target" Target when triggered. "killtarget" Target to kill when triggered. diff --git a/src/shared/w_ak47.qc b/src/shared/w_ak47.qc index 2bb1c70..0fa6161 100644 --- a/src/shared/w_ak47.qc +++ b/src/shared/w_ak47.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_ak47 (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_ak47.mdl" +/*!QUAKED weapon_ak47 (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -25,6 +24,8 @@ AK-47 Weapon Price: $2500 Terrorists only weapon +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_ak47.mdl" */ #ifdef CLIENT @@ -215,6 +216,7 @@ w_ak47_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::ak47_mag, player::ammo_762mm, 30); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_aug.qc b/src/shared/w_aug.qc index e00359b..6d5c510 100644 --- a/src/shared/w_aug.qc +++ b/src/shared/w_aug.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_aug (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_aug.mdl" +/*!QUAKED weapon_aug (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -25,6 +24,8 @@ Steyr AUG Weapon Price: $3500 Counter-Terrorists only weapon +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_aug.mdl" */ enum @@ -198,6 +199,7 @@ w_aug_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::aug_mag, player::ammo_762mm, 30); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_awp.qc b/src/shared/w_awp.qc index e3412c0..f2aba3c 100644 --- a/src/shared/w_awp.qc +++ b/src/shared/w_awp.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_awp (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_awp.mdl" +/*!QUAKED weapon_awp (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ AWP (AI Arctic Warfare/Magnum) Weapon - Buy Menu - Price: $4750 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_awp.mdl" */ #ifdef CLIENT @@ -267,6 +268,7 @@ w_awp_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::awp_mag, player::ammo_338mag, 10); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_c4bomb.qc b/src/shared/w_c4bomb.qc index 0f3da67..1ae4780 100644 --- a/src/shared/w_c4bomb.qc +++ b/src/shared/w_c4bomb.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_c4bomb (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_c4.mdl" +/*!QUAKED weapon_c4bomb (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -26,6 +25,8 @@ Default arsenal for Terrorists Can only be picked up by Terrorists and planted in func_bombtarget brush entities. +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_c4.mdl" */ /* C4 weapon logic */ diff --git a/src/shared/w_deagle.qc b/src/shared/w_deagle.qc index 17515d2..aa9c1c6 100644 --- a/src/shared/w_deagle.qc +++ b/src/shared/w_deagle.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_deagle (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_deagle.mdl" +/*!QUAKED weapon_deagle (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ Desert Eagle .50 AE Weapon - Buy Menu - Price: $650 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_deagle.mdl" */ #ifdef CLIENT @@ -214,6 +215,7 @@ w_deagle_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::deagle_mag, player::ammo_50ae, 7); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_elites.qc b/src/shared/w_elites.qc index 08620cc..44f74d9 100644 --- a/src/shared/w_elites.qc +++ b/src/shared/w_elites.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_elites (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_elite.mdl" +/*!QUAKED weapon_elites (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ Dual Beretta 96G (Elites) Weapon - Buy Menu - Price: $1000 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_elite.mdl" */ #ifdef CLIENT @@ -283,6 +284,7 @@ w_elites_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::elites_mag, player::ammo_9mm, 30); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_fiveseven.qc b/src/shared/w_fiveseven.qc index ae5d312..83fb8f6 100644 --- a/src/shared/w_fiveseven.qc +++ b/src/shared/w_fiveseven.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_fiveseven (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_fiveseven.mdl" +/*!QUAKED weapon_fiveseven (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ Five-SeveN Weapon - Buy Menu - Price: $750 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_fiveseven.mdl" */ enum @@ -182,6 +183,7 @@ w_fiveseven_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::fiveseven_mag, player::ammo_57mm, 20); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_flashbang.qc b/src/shared/w_flashbang.qc index d447313..8e01f7c 100644 --- a/src/shared/w_flashbang.qc +++ b/src/shared/w_flashbang.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_flashbang (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_flashbang.mdl" +/*!QUAKED weapon_flashbang (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -26,6 +25,8 @@ When thrown, nearby players become blinded temporarily from the blast. - Buy Menu - Price: $200 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_flashbang.mdl" */ enum @@ -162,6 +163,9 @@ w_flashbang_primary(player pl) /* Ammo check */ if (pl.ammo_fbgrenade <= 0) { +#ifdef SERVER + Weapons_RemoveItem(pl, WEAPON_FLASHBANG); +#endif return; } diff --git a/src/shared/w_g3sg1.qc b/src/shared/w_g3sg1.qc index 5473ccc..115ef6a 100644 --- a/src/shared/w_g3sg1.qc +++ b/src/shared/w_g3sg1.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_g3sg1 (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_g3sg1.mdl" +/*!QUAKED weapon_g3sg1 (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,7 +23,8 @@ Heckler & Koch G3/SG-1 Weapon - Buy Menu - Price: $5000 -*/ +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_g3sg1.mdl"*/ enum { @@ -188,7 +188,8 @@ w_g3sg1_reload(player pl) #ifdef SERVER static void w_weapon_reload_done(void) { player pl = (player)self; - Weapons_ReloadWeapon(pl, player::g3sg1_mag, player::ammo_762mm, 20); + Weapons_ReloadWeapon(pl, player::g3sg1_mag, player::ammo_762mm, 20); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_glock18.qc b/src/shared/w_glock18.qc index 9b2dc17..014aaba 100644 --- a/src/shared/w_glock18.qc +++ b/src/shared/w_glock18.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_glock18 (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_glock18.mdl" +/*!QUAKED weapon_glock18 (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -26,6 +25,8 @@ Default arsenal for Terrorists - Buy Menu - Price: $400 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_glock18.mdl" */ enum @@ -248,6 +249,7 @@ w_glock18_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::glock18_mag, player::ammo_9mm, 20); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_hegrenade.qc b/src/shared/w_hegrenade.qc index 7475ecb..97e1d50 100644 --- a/src/shared/w_hegrenade.qc +++ b/src/shared/w_hegrenade.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_hegrenade (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_hegrenade.mdl" +/*!QUAKED weapon_hegrenade (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -26,6 +25,8 @@ When thrown, explodes with a fairly deadly blast radius to players. - Buy Menu - Price: $300 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_hegrenade.mdl" */ enum @@ -164,6 +165,9 @@ w_hegrenade_primary(player pl) /* Ammo check */ if (pl.ammo_hegrenade <= 0) { +#ifdef SERVER + Weapons_RemoveItem(pl, WEAPON_HEGRENADE); +#endif return; } diff --git a/src/shared/w_knife.qc b/src/shared/w_knife.qc index 82f663f..5a0ab27 100644 --- a/src/shared/w_knife.qc +++ b/src/shared/w_knife.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_knife (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_knife.mdl" +/*!QUAKED weapon_knife (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -23,6 +22,8 @@ Knife Weapon Default arsenal on both teams +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_knife.mdl" */ enum diff --git a/src/shared/w_m3.qc b/src/shared/w_m3.qc index ac69846..54a039b 100644 --- a/src/shared/w_m3.qc +++ b/src/shared/w_m3.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_m3 (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_m3.mdl" +/*!QUAKED weapon_m3 (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ Benneli M3 Super90 Weapon - Buy Menu - Price: $1700 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_m3.mdl" */ #ifdef CLIENT diff --git a/src/shared/w_m4a1.qc b/src/shared/w_m4a1.qc index a1931a5..650fb43 100644 --- a/src/shared/w_m4a1.qc +++ b/src/shared/w_m4a1.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_m4a1 (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_m4a1.mdl" +/*!QUAKED weapon_m4a1 (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -25,6 +24,8 @@ Colt M4A1 Carbine Weapon Price: $3100 Counter-Terrorists only weapon +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_m4a1.mdl" */ enum @@ -245,6 +246,7 @@ w_m4a1_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::m4a1_mag, player::ammo_556mm, 30); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_mac10.qc b/src/shared/w_mac10.qc index a0a6246..7c92321 100644 --- a/src/shared/w_mac10.qc +++ b/src/shared/w_mac10.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_mac10 (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_mac10.mdl" +/*!QUAKED weapon_mac10 (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ Ingram MAC-10 Weapon - Buy Menu - Price: $1400 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_mac10.mdl" */ enum @@ -177,6 +178,7 @@ w_mac10_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::mac10_mag, player::ammo_45acp, 30); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_mp5.qc b/src/shared/w_mp5.qc index e292354..ecfe9d4 100644 --- a/src/shared/w_mp5.qc +++ b/src/shared/w_mp5.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_mp5navy (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_mp5.mdl" +/*!QUAKED weapon_mp5navy (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ Heckler & Koch MP5-Navy Weapon - Buy Menu - Price: $1500 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_mp5.mdl" */ enum @@ -175,6 +176,7 @@ w_mp5_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::mp5_mag, player::ammo_9mm, 30); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_p228.qc b/src/shared/w_p228.qc index 3f4aa79..4c5a878 100644 --- a/src/shared/w_p228.qc +++ b/src/shared/w_p228.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_ (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_p228.mdl" +/*!QUAKED weapon_p228 (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ SIG P228 Weapon - Buy Menu - Price: $600 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_p228.mdl" */ enum @@ -183,6 +184,7 @@ w_p228_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::p228_mag, player::ammo_357sig, 13); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_p90.qc b/src/shared/w_p90.qc index 7953eeb..1b937f7 100644 --- a/src/shared/w_p90.qc +++ b/src/shared/w_p90.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_p90 (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_p90.mdl" +/*!QUAKED weapon_p90 (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ FN P90 Weapon - Buy Menu - Price: $2350 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_p90.mdl" */ enum @@ -175,6 +176,7 @@ w_p90_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::p90_mag, player::ammo_57mm, 50); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_para.qc b/src/shared/w_para.qc index 5313e88..70e00c9 100644 --- a/src/shared/w_para.qc +++ b/src/shared/w_para.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_m249 (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_m249.mdl" +/*!QUAKED weapon_m249 (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ FN M249 Para Weapon - Buy Menu - Price: $5750 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_m249.mdl" */ enum @@ -168,6 +169,7 @@ w_para_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::para_mag, player::ammo_556mmbox, 100); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_scout.qc b/src/shared/w_scout.qc index 4744dbf..768e030 100644 --- a/src/shared/w_scout.qc +++ b/src/shared/w_scout.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_scout (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_scout.mdl" +/*!QUAKED weapon_scout (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ Steyr Scout Weapon - Buy Menu - Price: $1250 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_scout.mdl" */ enum @@ -228,6 +229,7 @@ w_scout_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::scout_mag, player::ammo_762mm, 10); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_sg550.qc b/src/shared/w_sg550.qc index 29fe8ce..9e6c5d8 100644 --- a/src/shared/w_sg550.qc +++ b/src/shared/w_sg550.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_sg550 (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_sg550.mdl" +/*!QUAKED weapon_sg550 (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ SIG SG 550 Weapon - Buy Menu - Price: $4200 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_sg550.mdl" */ enum @@ -191,6 +192,7 @@ w_sg550_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::sg550_mag, player::ammo_556mm, 30); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_sg552.qc b/src/shared/w_sg552.qc index 747c9ee..76d222c 100644 --- a/src/shared/w_sg552.qc +++ b/src/shared/w_sg552.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_sg552 (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_sg552.mdl" +/*!QUAKED weapon_sg552 (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ SIG SG 552 Commando Weapon - Buy Menu - Price: $3500 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_sg552.mdl" */ enum @@ -195,6 +196,7 @@ w_sg552_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::sg552_mag, player::ammo_556mm, 30); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_smokegrenade.qc b/src/shared/w_smokegrenade.qc index 90330ef..5efe5ca 100644 --- a/src/shared/w_smokegrenade.qc +++ b/src/shared/w_smokegrenade.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_smokegrenade (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_smokegrenade.mdl" +/*!QUAKED weapon_smokegrenade (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -26,6 +25,8 @@ When thrown, the explosion casts view-blocking smoke in that radius. - Buy Menu - Price: $300 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_smokegrenade.mdl" */ enum @@ -162,6 +163,9 @@ w_smokegrenade_primary(player pl) /* Ammo check */ if (pl.ammo_smokegrenade <= 0) { +#ifdef SERVER + Weapons_RemoveItem(pl, WEAPON_SMOKEGRENADE); +#endif return; } diff --git a/src/shared/w_tmp.qc b/src/shared/w_tmp.qc index fa1a21d..808d820 100644 --- a/src/shared/w_tmp.qc +++ b/src/shared/w_tmp.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_tmp (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_tmp.mdl" +/*!QUAKED weapon_tmp (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ Steyr Tactical Weapon - Buy Menu - Price: $1250 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_tmp.mdl" */ enum @@ -175,6 +176,7 @@ w_tmp_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::tmp_mag, player::ammo_9mm, 30); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_ump45.qc b/src/shared/w_ump45.qc index c620621..57ae866 100644 --- a/src/shared/w_ump45.qc +++ b/src/shared/w_ump45.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_ump45 (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_ump45.mdl" +/*!QUAKED weapon_ump45 (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ Heckler & Koch UMP .45 ACP Weapon - Buy Menu - Price: $1700 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_ump45.mdl" */ enum @@ -174,6 +175,7 @@ w_ump45_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::ump45_mag, player::ammo_45acp, 25); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_usp45.qc b/src/shared/w_usp45.qc index 2c4552a..0dd5d88 100644 --- a/src/shared/w_usp45.qc +++ b/src/shared/w_usp45.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_usp45 (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_usp45.mdl" +/*!QUAKED weapon_usp45 (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -26,6 +25,8 @@ Default arsenal for Counter-Terrorists - Buy Menu - Price: $500 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_usp45.mdl" */ enum @@ -254,6 +255,7 @@ w_usp45_reload(player pl) static void w_weapon_reload_done(void) { player pl = (player)self; Weapons_ReloadWeapon(pl, player::usp45_mag, player::ammo_45acp, 12); + Cstrike_ShotReset(pl); } pl.think = w_weapon_reload_done; diff --git a/src/shared/w_xm1014.qc b/src/shared/w_xm1014.qc index 75b36f3..f91bd46 100644 --- a/src/shared/w_xm1014.qc +++ b/src/shared/w_xm1014.qc @@ -14,8 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED weapon_xm1014 (0 0 1) (-16 -16 0) (16 16 32) -"model" "models/w_xm1014.mdl" +/*!QUAKED weapon_xm1014 (0 0 1) (-16 -16 0) (16 16 32) COUNTER-STRIKE (1999) ENTITY @@ -24,6 +23,8 @@ Benneli XM1014 Weapon - Buy Menu - Price: $3000 +-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- +model="models/w_xm1014.mdl" */ #ifdef CLIENT diff --git a/src/shared/weapons_cstrike.qc b/src/shared/weapons_cstrike.qc index a54d37c..c00c725 100644 --- a/src/shared/weapons_cstrike.qc +++ b/src/shared/weapons_cstrike.qc @@ -187,6 +187,14 @@ Cstrike_ShotMultiplierUpdate(player pl) pl.cs_shottime = max(0, pl.cs_shottime - input_timelength); } + +void +Cstrike_ShotReset(player pl) +{ + pl.cs_shottime = 0.0f; + pl.cs_shotmultiplier = 0; +} + void w_cstrike_weaponrelease(void) { @@ -194,3 +202,9 @@ w_cstrike_weaponrelease(void) pl.punchangle[1] *= 0.95; Cstrike_ShotMultiplierUpdate(pl); } + +void +w_cstrke_switched(player pl) +{ + Cstrike_ShotReset(pl); +} diff --git a/zpak001.pk3dir/def/monsters.def b/zpak001.pk3dir/def/monsters.def new file mode 100644 index 0000000..e69de29 diff --git a/zpak001.pk3dir/def/weapons.def b/zpak001.pk3dir/def/weapons.def new file mode 100644 index 0000000..e69de29 From 7409ef7d6a8f472806aea70e6f2e59dfd69143fb Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Thu, 27 Jul 2023 23:15:56 -0700 Subject: [PATCH 2/3] Rebuild against FreeHL Develop --- src/client/game_event.qc | 61 ---------------------------- src/client/init.qc | 5 --- src/client/progs.src | 1 + src/server/gamerules_singleplayer.qc | 2 +- src/shared/include.src | 5 --- src/shared/w_hegrenade.qc | 2 +- zpak001.pk3dir/scripts/constants.txt | 29 +++++++++++++ 7 files changed, 32 insertions(+), 73 deletions(-) create mode 100644 zpak001.pk3dir/scripts/constants.txt diff --git a/src/client/game_event.qc b/src/client/game_event.qc index 6247d5f..641d7b2 100644 --- a/src/client/game_event.qc +++ b/src/client/game_event.qc @@ -21,28 +21,6 @@ switch (fHeader) { case EV_OBITUARY: Obituary_Parse(); break; - case EV_SPARK: - vector vSparkPos, vSparkAngle; - vSparkPos[0] = readcoord(); - vSparkPos[1] = readcoord(); - vSparkPos[2] = readcoord(); - vSparkAngle[0] = readcoord(); - vSparkAngle[1] = readcoord(); - vSparkAngle[2] = readcoord(); - FX_Spark(vSparkPos, vSparkAngle); - break; - case EV_GIBHUMAN: - vector vGibPos; - vGibPos[0] = readcoord(); - vGibPos[1] = readcoord(); - vGibPos[2] = readcoord(); - vector vDir; - vDir[0] = readcoord(); - vDir[1] = readcoord(); - vDir[2] = readcoord(); - float flForce = readfloat(); - FX_GibHuman(vGibPos, vDir, flForce); - break; case EV_BLOOD: vector vBloodPos; vector vBloodColor; @@ -57,45 +35,6 @@ switch (fHeader) { FX_Blood(vBloodPos, vBloodColor); break; - case EV_EXPLOSION: - vector vExploPos; - - vExploPos[0] = readcoord(); - vExploPos[1] = readcoord(); - vExploPos[2] = readcoord(); - - FX_Explosion(vExploPos); - break; - case EV_MODELGIB: - vector vecPos; - vecPos[0] = readcoord(); - vecPos[1] = readcoord(); - vecPos[2] = readcoord(); - - vector vSize; - vSize[0] = readcoord(); - vSize[1] = readcoord(); - vSize[2] = readcoord(); - - float fStyle = readbyte(); - int count = readbyte(); - FX_BreakModel(count, vecPos, vSize, [0,0,0], fStyle); - break; - case EV_IMPACT: - impactType_t iType; - vector vOrigin, vNormal; - - iType = (impactType_t)readbyte(); - vOrigin[0] = readcoord(); - vOrigin[1] = readcoord(); - vOrigin[2] = readcoord(); - - vNormal[0] = readcoord(); - vNormal[1] = readcoord(); - vNormal[2] = readcoord(); - - FX_Impact(iType, vOrigin, vNormal); - break; case EV_SMOKE: vector vSmokePos; vSmokePos[0] = readcoord(); diff --git a/src/client/init.qc b/src/client/init.qc index 8344ea0..1c5f260 100644 --- a/src/client/init.qc +++ b/src/client/init.qc @@ -162,11 +162,6 @@ ClientGame_RendererRestart(string rstr) Damage_Precache(); FX_Blood_Init(); - FX_BreakModel_Init(); - FX_Explosion_Init(); - FX_GibHuman_Init(); - FX_Spark_Init(); - FX_Impact_Init(); FX_Smokenade_Init(); Radar_Init(); diff --git a/src/client/progs.src b/src/client/progs.src index 13469b8..0e73389 100644 --- a/src/client/progs.src +++ b/src/client/progs.src @@ -37,6 +37,7 @@ crosshair.qc hud_ammonotify.qc hud.qc hud_weaponselect.qc +../../../valve/src/client/hud_sprite.qc ../../../valve/src/client/scoreboard.qc radio.qc ../../../valve/src/client/modelevent.qc diff --git a/src/server/gamerules_singleplayer.qc b/src/server/gamerules_singleplayer.qc index 66c0b76..b56b9c6 100644 --- a/src/server/gamerules_singleplayer.qc +++ b/src/server/gamerules_singleplayer.qc @@ -25,7 +25,7 @@ CSSingleplayerRules::PlayerDeath(NSClientPlayer pl) if (pl.health < -50) { pl.health = 0; - FX_GibHuman(pl.origin, vectoangles(pl.origin - g_dmg_eAttacker.origin), g_dmg_iDamage * 2.0f); + //FX_GibHuman(pl.origin, vectoangles(pl.origin - g_dmg_eAttacker.origin), g_dmg_iDamage * 2.0f); return; } diff --git a/src/shared/include.src b/src/shared/include.src index 4be45b6..1cea513 100644 --- a/src/shared/include.src +++ b/src/shared/include.src @@ -8,12 +8,7 @@ animations.qc item_c4bomb.h ../../../valve/src/shared/fx_blood.qc -../../../valve/src/shared/fx_breakmodel.qc -../../../valve/src/shared/fx_explosion.qc -../../../valve/src/shared/fx_gibhuman.qc -../../../valve/src/shared/fx_spark.qc ../../../valve/src/shared/fx_corpse.qc -fx_impact.qc fx_flashbang.qc fx_smokenade.qc diff --git a/src/shared/w_hegrenade.qc b/src/shared/w_hegrenade.qc index 97e1d50..7e1dcde 100644 --- a/src/shared/w_hegrenade.qc +++ b/src/shared/w_hegrenade.qc @@ -103,7 +103,7 @@ w_hegrenade_throw(player pl) static void hegrenade_explode(void) { float dmg = 100; - FX_Explosion(self.origin); + pointparticles(particleeffectnum("fx_explosion.main"), self.origin, [0,0,0], 1); Damage_Radius(self.origin, self.owner, dmg, dmg * 2.5f, TRUE, WEAPON_HEGRENADE); Sound_Play(self, CHAN_BODY, "weapon_hegrenade.explode"); remove(self); diff --git a/zpak001.pk3dir/scripts/constants.txt b/zpak001.pk3dir/scripts/constants.txt new file mode 100644 index 0000000..0438b01 --- /dev/null +++ b/zpak001.pk3dir/scripts/constants.txt @@ -0,0 +1,29 @@ +// weapon constants +WEAPON_NONE 0 +WEAPON_M3 1 +WEAPON_XM1014 2 +WEAPON_MP5 3 +WEAPON_P90 4 +WEAPON_UMP45 5 +WEAPON_MAC10 6 +WEAPON_TMP 7 +WEAPON_AK47 8 +WEAPON_SG552 9 +WEAPON_M4A1 10 +WEAPON_AUG 11 +WEAPON_SCOUT 12 +WEAPON_AWP 13 +WEAPON_G3SG1 14 +WEAPON_SG550 15 +WEAPON_PARA 16 +WEAPON_USP45 17 +WEAPON_GLOCK18 18 +WEAPON_DEAGLE 19 +WEAPON_P228 20 +WEAPON_ELITES 21 +WEAPON_FIVESEVEN 22 +WEAPON_KNIFE 23 +WEAPON_HEGRENADE 24 +WEAPON_FLASHBANG 25 +WEAPON_SMOKEGRENADE 26 +WEAPON_C4BOMB 27 \ No newline at end of file From ac56cfd8f234cca681a630080198bf5866bfb68b Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Mon, 18 Sep 2023 18:48:26 -0700 Subject: [PATCH 3/3] Client: Explicit precache of the muzzleflash models. --- src/client/init.qc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/client/init.qc b/src/client/init.qc index 1c5f260..6411e03 100644 --- a/src/client/init.qc +++ b/src/client/init.qc @@ -154,6 +154,9 @@ ClientGame_RendererRestart(string rstr) precache_model("models/shotgunshell.mdl"); /* there's also muzzleflash.spr, but that's just MUZZLE_SMALL again */ + precache_model("sprites/muzzleflash1.spr"); + precache_model("sprites/muzzleflash2.spr"); + precache_model("sprites/muzzleflash3.spr"); MUZZLE_RIFLE = (int)getmodelindex("sprites/muzzleflash1.spr"); MUZZLE_SMALL = (int)getmodelindex("sprites/muzzleflash2.spr"); MUZZLE_WEIRD = (int)getmodelindex("sprites/muzzleflash3.spr");