From 674206349a17af42d4aa05b841832b6fee9a6f5f Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Mon, 4 May 2020 05:48:19 +0200 Subject: [PATCH] Half-Life: Fix crash with obituaries and invalid weapons. --- src/client/valve/obituary.c | 11 +++++++---- src/gs-entbase/client/baseentity.cpp | 7 ++++++- src/server/cstrike/item_c4bomb.cpp | 4 ++-- src/shared/cstrike/w_ak47.c | 5 +++-- src/shared/cstrike/w_aug.c | 5 +++-- src/shared/cstrike/w_awp.c | 5 +++-- src/shared/cstrike/w_c4bomb.c | 4 +--- src/shared/cstrike/w_deagle.c | 5 +++-- src/shared/cstrike/w_elites.c | 5 +++-- src/shared/cstrike/w_fiveseven.c | 5 +++-- src/shared/cstrike/w_flashbang.c | 5 +++-- src/shared/cstrike/w_g3sg1.c | 5 +++-- src/shared/cstrike/w_glock18.c | 5 +++-- src/shared/cstrike/w_hegrenade.c | 5 +++-- src/shared/cstrike/w_knife.c | 5 +++-- src/shared/cstrike/w_m3.c | 5 +++-- src/shared/cstrike/w_m4a1.c | 5 +++-- src/shared/cstrike/w_mac10.c | 5 +++-- src/shared/cstrike/w_mp5.c | 5 +++-- src/shared/cstrike/w_p228.c | 7 +++---- src/shared/cstrike/w_p90.c | 5 +++-- src/shared/cstrike/w_para.c | 5 +++-- src/shared/cstrike/w_scout.c | 5 +++-- src/shared/cstrike/w_sg550.c | 5 +++-- src/shared/cstrike/w_sg552.c | 5 +++-- src/shared/cstrike/w_smokegrenade.c | 5 +++-- src/shared/cstrike/w_tmp.c | 5 +++-- src/shared/cstrike/w_ump45.c | 5 +++-- src/shared/cstrike/w_usp45.c | 5 +++-- src/shared/cstrike/w_xm1014.c | 5 +++-- src/shared/gearbox/w_displacer.c | 7 +++++-- src/shared/gearbox/w_eagle.c | 8 +++++--- src/shared/gearbox/w_grapple.c | 5 ++++- src/shared/gearbox/w_knife.c | 5 ++++- src/shared/gearbox/w_m249.c | 7 +++++-- src/shared/gearbox/w_penguin.c | 7 +++++-- src/shared/gearbox/w_pipewrench.c | 5 ++++- src/shared/gearbox/w_shockrifle.c | 9 ++++----- src/shared/gearbox/w_sniperrifle.c | 7 +++++-- src/shared/gearbox/w_sporelauncher.c | 7 +++++-- src/shared/valve/w_crossbow.c | 11 +++++------ src/shared/valve/w_crowbar.c | 6 +++--- src/shared/valve/w_egon.c | 5 ++++- src/shared/valve/w_gauss.c | 9 ++++++--- src/shared/valve/w_glock.c | 6 +++--- src/shared/valve/w_handgrenade.c | 6 +++--- src/shared/valve/w_hornetgun.c | 10 +++++----- src/shared/valve/w_mp5.c | 8 ++++---- src/shared/valve/w_python.c | 8 ++++---- src/shared/valve/w_rpg.c | 7 ++++--- src/shared/valve/w_satchel.c | 3 ++- src/shared/valve/w_shotgun.c | 6 +++--- src/shared/valve/w_snark.c | 10 +++++----- src/shared/valve/w_tripmine.c | 6 +++--- 54 files changed, 194 insertions(+), 132 deletions(-) diff --git a/src/client/valve/obituary.c b/src/client/valve/obituary.c index 6b672868..3dac45b0 100644 --- a/src/client/valve/obituary.c +++ b/src/client/valve/obituary.c @@ -86,6 +86,7 @@ Obituary_Precache(void) void Obituary_KillIcon(int id, float w) { + if (w > 0) for (int i = 0; i < g_obtype_count; i++) { if (g_weapons[w].name == g_obtypes[i].name) { g_obituary[id].icon = i; @@ -130,11 +131,13 @@ Obituary_Add(string attacker, string victim, float weapon, float flags) g_obituary_time = OBITUARY_TIME; - string conprint = g_weapons[weapon].deathmsg(); + if (g_weapons[weapon].deathmsg) { + string conprint = g_weapons[weapon].deathmsg(); - if (conprint != "") { - print(sprintf(conprint, attacker, victim)); - print("\n"); + if (conprint != "") { + print(sprintf(conprint, attacker, victim)); + print("\n"); + } } } diff --git a/src/gs-entbase/client/baseentity.cpp b/src/gs-entbase/client/baseentity.cpp index fc2e7b10..fb925169 100644 --- a/src/gs-entbase/client/baseentity.cpp +++ b/src/gs-entbase/client/baseentity.cpp @@ -73,9 +73,14 @@ CBaseEntity::RenderFXPass(void) case RM_TEXTURE: break; case RM_GLOW: + vector vecPlayer; +#ifdef WASTES + vecPlayer = [0,0,0]; +#else int s = (float)getproperty(VF_ACTIVESEAT); pSeat = &g_seats[s]; - vector vecPlayer = pSeat->m_vecPredictedOrigin; + vecPlayer = pSeat->m_vecPredictedOrigin; +#endif if (checkpvs(vecPlayer, this) == FALSE) { alpha -= clframetime; diff --git a/src/server/cstrike/item_c4bomb.cpp b/src/server/cstrike/item_c4bomb.cpp index b106bf2c..d81667db 100644 --- a/src/server/cstrike/item_c4bomb.cpp +++ b/src/server/cstrike/item_c4bomb.cpp @@ -36,7 +36,7 @@ item_c4::Logic(void) * if they won by detonating the bomb. */ rules.RoundOver(TEAM_T, 3500, FALSE); Damage_Radius(origin, this.owner, 500, g_cstrike_bombradius, TRUE, WEAPON_C4BOMB); - sound(this, CHAN_VOICE, "weapons/c4_explode1.wav", 1.0, ATTN_NONE); + Sound_Play(this, CHAN_VOICE, "weapon_c4bomb.explode"); for (entity e = world; (e = find(e, ::classname, "func_bomb_target"));) { CBaseTrigger trigger = (CBaseTrigger)e; @@ -82,7 +82,7 @@ item_c4::item_c4(void) customphysics = Logic; m_flExplodeTime = time + 45.0f; - sound(this, CHAN_WEAPON, "weapons/c4_plant.wav", 1.0f, ATTN_IDLE); + Sound_Play(this, CHAN_WEAPON, "weapon_c4bomb.plant"); } void diff --git a/src/shared/cstrike/w_ak47.c b/src/shared/cstrike/w_ak47.c index 876ae568..8b9e1df4 100644 --- a/src/shared/cstrike/w_ak47.c +++ b/src/shared/cstrike/w_ak47.c @@ -42,10 +42,11 @@ w_ak47_precache(void) { #ifdef SERVER Sound_Precache("weapon_ak47.fire"); -#endif - precache_model("models/v_ak47.mdl"); precache_model("models/w_ak47.mdl"); +#else + precache_model("models/v_ak47.mdl"); precache_model("models/p_ak47.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_aug.c b/src/shared/cstrike/w_aug.c index d30565c4..de720694 100644 --- a/src/shared/cstrike/w_aug.c +++ b/src/shared/cstrike/w_aug.c @@ -42,10 +42,11 @@ w_aug_precache(void) { #ifdef SERVER Sound_Precache("weapon_aug.fire"); -#endif - precache_model("models/v_aug.mdl"); precache_model("models/w_aug.mdl"); +#else + precache_model("models/v_aug.mdl"); precache_model("models/p_aug.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_awp.c b/src/shared/cstrike/w_awp.c index 160c45ce..0bbd693e 100644 --- a/src/shared/cstrike/w_awp.c +++ b/src/shared/cstrike/w_awp.c @@ -42,10 +42,11 @@ w_awp_precache(void) #ifdef SERVER Sound_Precache("weapon_awp.fire"); Sound_Precache("weapon_awp.zoom"); -#endif - precache_model("models/v_awp.mdl"); precache_model("models/w_awp.mdl"); +#else + precache_model("models/v_awp.mdl"); precache_model("models/p_awp.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_c4bomb.c b/src/shared/cstrike/w_c4bomb.c index ac8b2942..bd5adfad 100644 --- a/src/shared/cstrike/w_c4bomb.c +++ b/src/shared/cstrike/w_c4bomb.c @@ -54,19 +54,17 @@ w_c4bomb_precache(void) Sound_Precache("weapon_c4bomb.disarmed"); Sound_Precache("weapon_c4bomb.explode"); Sound_Precache("weapon_c4bomb.plant"); - precache_sound("weapons/c4_plant.wav"); precache_sound("weapons/c4_beep1.wav"); precache_sound("weapons/c4_beep2.wav"); precache_sound("weapons/c4_beep3.wav"); precache_sound("weapons/c4_beep4.wav"); precache_sound("weapons/c4_beep5.wav"); - precache_sound("weapons/c4_explode1.wav"); precache_model("models/w_c4.mdl"); precache_model("models/w_backpack.mdl"); - precache_model("models/p_c4.mdl"); precache_model("sprites/ledglow.spr"); #else precache_model("models/v_c4.mdl"); + precache_model("models/p_c4.mdl"); #endif } diff --git a/src/shared/cstrike/w_deagle.c b/src/shared/cstrike/w_deagle.c index 767a96f5..6d55a2dd 100644 --- a/src/shared/cstrike/w_deagle.c +++ b/src/shared/cstrike/w_deagle.c @@ -41,10 +41,11 @@ w_deagle_precache(void) { #ifdef SERVER Sound_Precache("weapon_deagle.fire"); -#endif - precache_model("models/v_deagle.mdl"); precache_model("models/w_deagle.mdl"); +#else + precache_model("models/v_deagle.mdl"); precache_model("models/p_deagle.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_elites.c b/src/shared/cstrike/w_elites.c index a96871bc..4fdb9661 100644 --- a/src/shared/cstrike/w_elites.c +++ b/src/shared/cstrike/w_elites.c @@ -50,10 +50,11 @@ w_elites_precache(void) { #ifdef SERVER Sound_Precache("weapon_elites.fire"); -#endif - precache_model("models/v_elite.mdl"); precache_model("models/w_elite.mdl"); +#else + precache_model("models/v_elite.mdl"); precache_model("models/p_elite.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_fiveseven.c b/src/shared/cstrike/w_fiveseven.c index 2c17b100..2204547f 100644 --- a/src/shared/cstrike/w_fiveseven.c +++ b/src/shared/cstrike/w_fiveseven.c @@ -41,10 +41,11 @@ w_fiveseven_precache(void) { #ifdef SERVER Sound_Precache("weapon_fiveseven.fire"); -#endif - precache_model("models/v_fiveseven.mdl"); precache_model("models/w_fiveseven.mdl"); +#else + precache_model("models/v_fiveseven.mdl"); precache_model("models/p_fiveseven.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_flashbang.c b/src/shared/cstrike/w_flashbang.c index 378dcc05..478b197f 100644 --- a/src/shared/cstrike/w_flashbang.c +++ b/src/shared/cstrike/w_flashbang.c @@ -42,10 +42,11 @@ w_flashbang_precache(void) #ifdef SERVER Sound_Precache("weapon_flashbang.bounce"); Sound_Precache("weapon_flashbang.explode"); -#endif - precache_model("models/v_flashbang.mdl"); precache_model("models/w_flashbang.mdl"); +#else + precache_model("models/v_flashbang.mdl"); precache_model("models/p_flashbang.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_g3sg1.c b/src/shared/cstrike/w_g3sg1.c index 64d53c98..e6d196e1 100644 --- a/src/shared/cstrike/w_g3sg1.c +++ b/src/shared/cstrike/w_g3sg1.c @@ -40,10 +40,11 @@ w_g3sg1_precache(void) { #ifdef SERVER Sound_Precache("weapon_g3sg1.fire"); -#endif - precache_model("models/v_g3sg1.mdl"); precache_model("models/w_g3sg1.mdl"); +#else + precache_model("models/v_g3sg1.mdl"); precache_model("models/p_g3sg1.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_glock18.c b/src/shared/cstrike/w_glock18.c index 4c0af774..609a274d 100644 --- a/src/shared/cstrike/w_glock18.c +++ b/src/shared/cstrike/w_glock18.c @@ -51,10 +51,11 @@ w_glock18_precache(void) #ifdef SERVER Sound_Precache("weapon_glock18.fire"); Sound_Precache("weapon_glock18.burstfire"); -#endif - precache_model("models/v_glock18.mdl"); precache_model("models/w_glock18.mdl"); +#else + precache_model("models/v_glock18.mdl"); precache_model("models/p_glock18.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_hegrenade.c b/src/shared/cstrike/w_hegrenade.c index 34e497d3..0dc5dec5 100644 --- a/src/shared/cstrike/w_hegrenade.c +++ b/src/shared/cstrike/w_hegrenade.c @@ -42,10 +42,11 @@ w_hegrenade_precache(void) #ifdef SERVER Sound_Precache("weapon_hegrenade.bounce"); Sound_Precache("weapon_hegrenade.explode"); -#endif - precache_model("models/v_hegrenade.mdl"); precache_model("models/w_hegrenade.mdl"); +#else + precache_model("models/v_hegrenade.mdl"); precache_model("models/p_hegrenade.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_knife.c b/src/shared/cstrike/w_knife.c index f9be0986..57b6a6ba 100644 --- a/src/shared/cstrike/w_knife.c +++ b/src/shared/cstrike/w_knife.c @@ -45,10 +45,11 @@ w_knife_precache(void) Sound_Precache("weapon_knife.hitbody"); Sound_Precache("weapon_knife.hithard"); Sound_Precache("weapon_knife.miss"); -#endif - precache_model("models/v_knife.mdl"); precache_model("models/w_knife.mdl"); +#else + precache_model("models/v_knife.mdl"); precache_model("models/p_knife.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_m3.c b/src/shared/cstrike/w_m3.c index f842f87a..31139329 100644 --- a/src/shared/cstrike/w_m3.c +++ b/src/shared/cstrike/w_m3.c @@ -50,10 +50,11 @@ w_m3_precache(void) { #ifdef SERVER Sound_Precache("weapon_m3.fire"); -#endif - precache_model("models/v_m3.mdl"); precache_model("models/w_m3.mdl"); +#else + precache_model("models/v_m3.mdl"); precache_model("models/p_m3.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_m4a1.c b/src/shared/cstrike/w_m4a1.c index 16f11267..8129ce74 100644 --- a/src/shared/cstrike/w_m4a1.c +++ b/src/shared/cstrike/w_m4a1.c @@ -51,10 +51,11 @@ w_m4a1_precache(void) #ifdef SERVER Sound_Precache("weapon_m4a1.fire"); Sound_Precache("weapon_m4a1.silenced"); -#endif - precache_model("models/v_m4a1.mdl"); precache_model("models/w_m4a1.mdl"); +#else + precache_model("models/v_m4a1.mdl"); precache_model("models/p_m4a1.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_mac10.c b/src/shared/cstrike/w_mac10.c index 548d1acb..4f01202e 100644 --- a/src/shared/cstrike/w_mac10.c +++ b/src/shared/cstrike/w_mac10.c @@ -41,10 +41,11 @@ w_mac10_precache(void) { #ifdef SERVER Sound_Precache("weapon_mac10.fire"); -#endif - precache_model("models/v_mac10.mdl"); precache_model("models/w_mac10.mdl"); +#else + precache_model("models/v_mac10.mdl"); precache_model("models/p_mac10.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_mp5.c b/src/shared/cstrike/w_mp5.c index 9e0d53e7..310d7687 100644 --- a/src/shared/cstrike/w_mp5.c +++ b/src/shared/cstrike/w_mp5.c @@ -41,10 +41,11 @@ w_mp5_precache(void) { #ifdef SERVER Sound_Precache("weapon_mp5.fire"); -#endif - precache_model("models/v_mp5.mdl"); precache_model("models/w_mp5.mdl"); +#else + precache_model("models/v_mp5.mdl"); precache_model("models/p_mp5.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_p228.c b/src/shared/cstrike/w_p228.c index b7e94a06..75759581 100644 --- a/src/shared/cstrike/w_p228.c +++ b/src/shared/cstrike/w_p228.c @@ -42,12 +42,11 @@ w_p228_precache(void) { #ifdef SERVER Sound_Precache("weapon_p228.fire"); -#endif - precache_model("models/v_p228.mdl"); precache_model("models/w_p228.mdl"); +#else + precache_model("models/v_p228.mdl"); precache_model("models/p_p228.mdl"); - precache_sound("weapons/p228-1.wav"); - precache_sound("weapons/p228-2.wav"); +#endif } void diff --git a/src/shared/cstrike/w_p90.c b/src/shared/cstrike/w_p90.c index 2111c0a2..82735bcb 100644 --- a/src/shared/cstrike/w_p90.c +++ b/src/shared/cstrike/w_p90.c @@ -41,10 +41,11 @@ w_p90_precache(void) { #ifdef SERVER Sound_Precache("weapon_p90.fire"); -#endif - precache_model("models/v_p90.mdl"); precache_model("models/w_p90.mdl"); +#else + precache_model("models/v_p90.mdl"); precache_model("models/p_p90.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_para.c b/src/shared/cstrike/w_para.c index 475588fb..a771cdcd 100644 --- a/src/shared/cstrike/w_para.c +++ b/src/shared/cstrike/w_para.c @@ -40,10 +40,11 @@ w_para_precache(void) { #ifdef SERVER Sound_Precache("weapon_para.fire"); -#endif - precache_model("models/v_m249.mdl"); precache_model("models/w_m249.mdl"); +#else + precache_model("models/v_m249.mdl"); precache_model("models/p_m249.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_scout.c b/src/shared/cstrike/w_scout.c index bcb2f8e7..370fb5f9 100644 --- a/src/shared/cstrike/w_scout.c +++ b/src/shared/cstrike/w_scout.c @@ -40,10 +40,11 @@ w_scout_precache(void) { #ifdef SERVER Sound_Precache("weapon_scout.fire"); -#endif - precache_model("models/v_scout.mdl"); precache_model("models/w_scout.mdl"); +#else + precache_model("models/v_scout.mdl"); precache_model("models/p_scout.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_sg550.c b/src/shared/cstrike/w_sg550.c index eb4dae0d..2d4f7dd1 100644 --- a/src/shared/cstrike/w_sg550.c +++ b/src/shared/cstrike/w_sg550.c @@ -40,10 +40,11 @@ w_sg550_precache(void) { #ifdef SERVER Sound_Precache("weapon_sg550.fire"); -#endif - precache_model("models/v_sg550.mdl"); precache_model("models/w_sg550.mdl"); +#else + precache_model("models/v_sg550.mdl"); precache_model("models/p_sg550.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_sg552.c b/src/shared/cstrike/w_sg552.c index 2afb49d3..e22c0804 100644 --- a/src/shared/cstrike/w_sg552.c +++ b/src/shared/cstrike/w_sg552.c @@ -41,10 +41,11 @@ w_sg552_precache(void) { #ifdef SERVER Sound_Precache("weapon_sg552.fire"); -#endif - precache_model("models/v_sg552.mdl"); precache_model("models/w_sg552.mdl"); +#else + precache_model("models/v_sg552.mdl"); precache_model("models/p_sg552.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_smokegrenade.c b/src/shared/cstrike/w_smokegrenade.c index b4596603..58c55714 100644 --- a/src/shared/cstrike/w_smokegrenade.c +++ b/src/shared/cstrike/w_smokegrenade.c @@ -42,10 +42,11 @@ w_smokegrenade_precache(void) #ifdef SERVER Sound_Precache("weapon_smokegrenade.bounce"); Sound_Precache("weapon_smokegrenade.explode"); -#endif - precache_model("models/v_smokegrenade.mdl"); precache_model("models/w_smokegrenade.mdl"); +#else + precache_model("models/v_smokegrenade.mdl"); precache_model("models/p_smokegrenade.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_tmp.c b/src/shared/cstrike/w_tmp.c index 66a2ce0b..c2f44a8d 100644 --- a/src/shared/cstrike/w_tmp.c +++ b/src/shared/cstrike/w_tmp.c @@ -41,10 +41,11 @@ w_tmp_precache(void) { #ifdef SERVER Sound_Precache("weapon_tmp.fire"); -#endif - precache_model("models/v_tmp.mdl"); precache_model("models/w_tmp.mdl"); +#else + precache_model("models/v_tmp.mdl"); precache_model("models/p_tmp.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_ump45.c b/src/shared/cstrike/w_ump45.c index c3bdfb38..7ec9c402 100644 --- a/src/shared/cstrike/w_ump45.c +++ b/src/shared/cstrike/w_ump45.c @@ -41,10 +41,11 @@ w_ump45_precache(void) { #ifdef SERVER Sound_Precache("weapon_ump45.fire"); -#endif - precache_model("models/v_ump45.mdl"); precache_model("models/w_ump45.mdl"); +#else + precache_model("models/v_ump45.mdl"); precache_model("models/p_ump45.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_usp45.c b/src/shared/cstrike/w_usp45.c index cbb11ba5..994e986b 100644 --- a/src/shared/cstrike/w_usp45.c +++ b/src/shared/cstrike/w_usp45.c @@ -54,10 +54,11 @@ w_usp45_precache(void) #ifdef SERVER Sound_Precache("weapon_usp45.fire"); Sound_Precache("weapon_usp45.silenced"); -#endif - precache_model("models/v_usp.mdl"); precache_model("models/w_usp.mdl"); +#else + precache_model("models/v_usp.mdl"); precache_model("models/p_usp.mdl"); +#endif } void diff --git a/src/shared/cstrike/w_xm1014.c b/src/shared/cstrike/w_xm1014.c index d5cf94ea..d73859cc 100644 --- a/src/shared/cstrike/w_xm1014.c +++ b/src/shared/cstrike/w_xm1014.c @@ -51,10 +51,11 @@ w_xm1014_precache(void) #ifdef SERVER Sound_Precache("weapon_xm1014.fire"); Sound_Precache("weapon_xm1014.insertshell"); -#endif - precache_model("models/v_xm1014.mdl"); precache_model("models/w_xm1014.mdl"); +#else + precache_model("models/v_xm1014.mdl"); precache_model("models/p_xm1014.mdl"); +#endif } void diff --git a/src/shared/gearbox/w_displacer.c b/src/shared/gearbox/w_displacer.c index 7d543514..95d93e38 100644 --- a/src/shared/gearbox/w_displacer.c +++ b/src/shared/gearbox/w_displacer.c @@ -41,6 +41,7 @@ entity Spawn_SelectRandom(string); void w_displacer_precache(void) { +#ifdef SERVER precache_sound("weapons/displacer_fire.wav"); precache_sound("weapons/displacer_impact.wav"); precache_sound("weapons/displacer_self.wav"); @@ -49,10 +50,12 @@ w_displacer_precache(void) precache_sound("weapons/displacer_start.wav"); precache_sound("weapons/displacer_teleport.wav"); precache_sound("weapons/displacer_teleport_player.wav"); - precache_model("models/v_displacer.mdl"); precache_model("models/w_displacer.mdl"); - precache_model("models/p_displacer.mdl"); precache_model("sprites/exit1.spr"); +#else + precache_model("models/v_displacer.mdl"); + precache_model("models/p_displacer.mdl"); +#endif } void diff --git a/src/shared/gearbox/w_eagle.c b/src/shared/gearbox/w_eagle.c index e4622292..858b96ab 100644 --- a/src/shared/gearbox/w_eagle.c +++ b/src/shared/gearbox/w_eagle.c @@ -41,13 +41,15 @@ enum void w_eagle_precache(void) { - precache_model("models/v_desert_eagle.mdl"); +#ifdef SERVER precache_model("models/w_desert_eagle.mdl"); - precache_model("models/p_desert_eagle.mdl"); - precache_sound("weapons/desert_eagle_fire.wav"); precache_sound("weapons/desert_eagle_sight.wav"); precache_sound("weapons/desert_eagle_sight2.wav"); +#else + precache_model("models/v_desert_eagle.mdl"); + precache_model("models/p_desert_eagle.mdl"); +#endif } int diff --git a/src/shared/gearbox/w_grapple.c b/src/shared/gearbox/w_grapple.c index 4bef3b49..5e48ec56 100644 --- a/src/shared/gearbox/w_grapple.c +++ b/src/shared/gearbox/w_grapple.c @@ -46,6 +46,7 @@ enum void w_grapple_precache(void) { +#ifdef SERVER precache_sound("weapons/bgrapple_cough.wav"); precache_sound("weapons/bgrapple_fire.wav"); precache_sound("weapons/bgrapple_impact.wav"); @@ -54,10 +55,12 @@ w_grapple_precache(void) precache_sound("weapons/bgrapple_wait.wav"); precache_model("sprites/_tongue.spr"); precache_model("sprites/tongue.spr"); + precache_model("models/w_bgrap.mdl"); +#else precache_model("models/v_bgrap.mdl"); precache_model("models/v_bgrap_tonguetip.mdl"); - precache_model("models/w_bgrap.mdl"); precache_model("models/p_bgrap.mdl"); +#endif } void diff --git a/src/shared/gearbox/w_knife.c b/src/shared/gearbox/w_knife.c index 6523bc71..3b37e4a0 100644 --- a/src/shared/gearbox/w_knife.c +++ b/src/shared/gearbox/w_knife.c @@ -41,6 +41,8 @@ enum void w_knife_precache(void) { +#ifdef SERVER + precache_model("models/w_knife.mdl"); precache_sound("weapons/knife1.wav"); precache_sound("weapons/knife2.wav"); precache_sound("weapons/knife3.wav"); @@ -48,9 +50,10 @@ w_knife_precache(void) precache_sound("weapons/knife_hit_wall2.wav"); precache_sound("weapons/knife_hit_flesh1.wav"); precache_sound("weapons/knife_hit_flesh2.wav"); +#else precache_model("models/v_knife.mdl"); - precache_model("models/w_knife.mdl"); precache_model("models/p_knife.mdl"); +#endif } void diff --git a/src/shared/gearbox/w_m249.c b/src/shared/gearbox/w_m249.c index ea6e6f79..e3dad74b 100644 --- a/src/shared/gearbox/w_m249.c +++ b/src/shared/gearbox/w_m249.c @@ -38,14 +38,17 @@ enum void w_m249_precache(void) { - precache_model("models/v_saw.mdl"); +#ifdef SERVER precache_model("models/w_saw.mdl"); - precache_model("models/p_saw.mdl"); precache_sound("weapons/saw_fire1.wav"); precache_sound("weapons/saw_fire2.wav"); precache_sound("weapons/saw_fire3.wav"); precache_sound("weapons/saw_reload.wav"); precache_sound("weapons/saw_reload2.wav"); +#else + precache_model("models/v_saw.mdl"); + precache_model("models/p_saw.mdl"); +#endif } int diff --git a/src/shared/gearbox/w_penguin.c b/src/shared/gearbox/w_penguin.c index 799dbabf..89d31f28 100644 --- a/src/shared/gearbox/w_penguin.c +++ b/src/shared/gearbox/w_penguin.c @@ -266,15 +266,18 @@ w_penguin_release(void) void w_penguin_precache(void) { +#ifdef SERVER precache_model("models/w_penguin.mdl"); - precache_model("models/p_penguin.mdl"); - precache_model("models/v_penguin.mdl"); precache_sound("squeek/sqk_deploy1.wav"); precache_sound("squeek/sqk_die1.wav"); precache_sound("squeek/sqk_blast1.wav"); precache_sound("squeek/sqk_hunt1.wav"); precache_sound("squeek/sqk_hunt2.wav"); precache_sound("squeek/sqk_hunt3.wav"); +#else + precache_model("models/p_penguin.mdl"); + precache_model("models/v_penguin.mdl"); +#endif } void diff --git a/src/shared/gearbox/w_pipewrench.c b/src/shared/gearbox/w_pipewrench.c index 071794e6..6e18a0bf 100644 --- a/src/shared/gearbox/w_pipewrench.c +++ b/src/shared/gearbox/w_pipewrench.c @@ -45,6 +45,7 @@ enum void w_pipewrench_precache(void) { +#ifdef SERVER precache_sound("weapons/pwrench_big_miss.wav"); precache_sound("weapons/pwrench_big_hit1.wav"); precache_sound("weapons/pwrench_big_hit2.wav"); @@ -57,9 +58,11 @@ w_pipewrench_precache(void) precache_sound("weapons/pwrench_hitbod1.wav"); precache_sound("weapons/pwrench_hitbod2.wav"); precache_sound("weapons/pwrench_hitbod3.wav"); - precache_model("models/v_pipe_wrench.mdl"); precache_model("models/w_pipe_wrench.mdl"); +#else precache_model("models/p_pipe_wrench.mdl"); + precache_model("models/v_pipe_wrench.mdl"); +#endif } void diff --git a/src/shared/gearbox/w_shockrifle.c b/src/shared/gearbox/w_shockrifle.c index 511b81b5..c23c0a7b 100644 --- a/src/shared/gearbox/w_shockrifle.c +++ b/src/shared/gearbox/w_shockrifle.c @@ -39,18 +39,17 @@ enum void w_shockrifle_precache(void) { - precache_model("models/v_shock.mdl"); +#ifdef SERVER precache_model("models/w_shock.mdl"); - precache_model("models/p_shock.mdl"); - precache_sound("weapons/shock_discharge.wav"); precache_sound("weapons/shock_draw.wav"); precache_sound("weapons/shock_fire.wav"); precache_sound("weapons/shock_impact.wav"); precache_sound("weapons/shock_recharge.wav"); - -#ifdef CLIENT +#else PART_SHOCKPIECE = particleeffectnum("shockrifle.shockrifle_piece"); + precache_model("models/v_shock.mdl"); + precache_model("models/p_shock.mdl"); #endif } diff --git a/src/shared/gearbox/w_sniperrifle.c b/src/shared/gearbox/w_sniperrifle.c index 45f2a370..ce7063ef 100644 --- a/src/shared/gearbox/w_sniperrifle.c +++ b/src/shared/gearbox/w_sniperrifle.c @@ -40,10 +40,13 @@ enum void w_sniperrifle_precache(void) { - precache_model("models/v_m40a1.mdl"); +#ifdef SERVER precache_model("models/w_m40a1.mdl"); - precache_model("models/p_m40a1.mdl"); precache_sound("weapons/sniper_fire.wav"); +#else + precache_model("models/v_m40a1.mdl"); + precache_model("models/p_m40a1.mdl"); +#endif } int diff --git a/src/shared/gearbox/w_sporelauncher.c b/src/shared/gearbox/w_sporelauncher.c index e5fa945f..c297146a 100644 --- a/src/shared/gearbox/w_sporelauncher.c +++ b/src/shared/gearbox/w_sporelauncher.c @@ -139,10 +139,9 @@ void Sporelauncher_AltFire(entity spawner, vector org, vector dir) void w_sporelauncher_precache(void) { +#ifdef SERVER precache_model("models/spore.mdl"); - precache_model("models/v_spore_launcher.mdl"); precache_model("models/w_spore_launcher.mdl"); - precache_model("models/p_spore_launcher.mdl"); precache_sound("weapons/splauncher_altfire.wav"); precache_sound("weapons/splauncher_bounce.wav"); precache_sound("weapons/splauncher_fire.wav"); @@ -153,6 +152,10 @@ w_sporelauncher_precache(void) precache_sound("weapons/spore_hit1.wav"); precache_sound("weapons/spore_hit2.wav"); precache_sound("weapons/spore_hit3.wav"); +#else + precache_model("models/v_spore_launcher.mdl"); + precache_model("models/p_spore_launcher.mdl"); +#endif } void diff --git a/src/shared/valve/w_crossbow.c b/src/shared/valve/w_crossbow.c index 72753c83..87d9a803 100644 --- a/src/shared/valve/w_crossbow.c +++ b/src/shared/valve/w_crossbow.c @@ -47,13 +47,12 @@ w_crossbow_precache(void) Sound_Precache("weapon_crossbow.hit"); Sound_Precache("weapon_crossbow.hitbody"); Sound_Precache("weapon_crossbow.reload"); -#endif precache_model("models/crossbow_bolt.mdl"); - precache_model("models/v_crossbow.mdl"); precache_model("models/w_crossbow.mdl"); +#else + precache_model("models/v_crossbow.mdl"); precache_model("models/p_crossbow.mdl"); - precache_sound("weapons/xbow_reload1.wav"); - precache_sound("weapons/xbow_fire1.wav"); +#endif } void @@ -255,7 +254,7 @@ w_crossbow_reload(void) #ifdef SERVER Weapons_ReloadWeapon(pl, player::crossbow_mag, player::ammo_bolt, 5); - sound(pl, CHAN_ITEM, "weapons/xbow_reload1.wav", 1.0f, ATTN_NORM); + Sound_Play(pl, CHAN_ITEM, "weapon_crossbow.reload"); #endif Weapons_ViewAnimation(CROSSBOW_RELOAD); @@ -366,7 +365,7 @@ w_crossbow_hudpic(int selected, vector pos, float a) weapon_t w_crossbow = { .name = "crossbow", - .id = ITEM_CROSSBOW, + .id = ITEM_CROSSBOW, .slot = 2, .slot_pos = 2, .draw = w_crossbow_draw, diff --git a/src/shared/valve/w_crowbar.c b/src/shared/valve/w_crowbar.c index d2c18dd1..00654166 100644 --- a/src/shared/valve/w_crowbar.c +++ b/src/shared/valve/w_crowbar.c @@ -43,11 +43,11 @@ w_crowbar_precache(void) Sound_Precache("weapon_crowbar.hit"); Sound_Precache("weapon_crowbar.miss"); Sound_Precache("weapon_crowbar.hitbody"); -#endif - - precache_model("models/v_crowbar.mdl"); precache_model("models/w_crowbar.mdl"); +#else + precache_model("models/v_crowbar.mdl"); precache_model("models/p_crowbar.mdl"); +#endif } void diff --git a/src/shared/valve/w_egon.c b/src/shared/valve/w_egon.c index 58243e9a..77615827 100644 --- a/src/shared/valve/w_egon.c +++ b/src/shared/valve/w_egon.c @@ -40,9 +40,12 @@ enum void w_egon_precache(void) { - precache_model("models/v_egon.mdl"); +#ifdef SERVER precache_model("models/w_egon.mdl"); +#else + precache_model("models/v_egon.mdl"); precache_model("models/p_egon.mdl"); +#endif } void w_egon_updateammo(player pl) { diff --git a/src/shared/valve/w_gauss.c b/src/shared/valve/w_gauss.c index ffca69f4..04c720a1 100644 --- a/src/shared/valve/w_gauss.c +++ b/src/shared/valve/w_gauss.c @@ -124,16 +124,19 @@ void w_gauss_release(void); void w_gauss_precache(void) { - precache_model("models/v_gauss.mdl"); +#ifdef SERVER precache_model("models/w_gauss.mdl"); - precache_model("models/p_gauss.mdl"); - precache_sound("weapons/gauss2.wav"); precache_model("sprites/yelflare1.spr"); precache_model("sprites/xbeam1.spr"); precache_sound("weapons/electro4.wav"); precache_sound("weapons/electro5.wav"); precache_sound("weapons/electro6.wav"); precache_sound("ambience/pulsemachine.wav"); + precache_sound("weapons/gauss2.wav"); +#else + precache_model("models/v_gauss.mdl"); + precache_model("models/p_gauss.mdl"); +#endif } void w_gauss_updateammo(player pl) { diff --git a/src/shared/valve/w_glock.c b/src/shared/valve/w_glock.c index e0aa9b09..8e97b894 100644 --- a/src/shared/valve/w_glock.c +++ b/src/shared/valve/w_glock.c @@ -52,11 +52,11 @@ w_glock_precache(void) { #ifdef SERVER Sound_Precache("weapon_glock.fire"); -#endif - - precache_model("models/v_9mmhandgun.mdl"); precache_model("models/w_9mmhandgun.mdl"); +#else + precache_model("models/v_9mmhandgun.mdl"); precache_model("models/p_9mmhandgun.mdl"); +#endif } void diff --git a/src/shared/valve/w_handgrenade.c b/src/shared/valve/w_handgrenade.c index a7b15119..96955d70 100644 --- a/src/shared/valve/w_handgrenade.c +++ b/src/shared/valve/w_handgrenade.c @@ -39,11 +39,11 @@ void w_handgrenade_precache(void) { #ifdef SERVER Sound_Precache("weapon_handgrenade.bounce"); -#endif - - precache_model("models/v_grenade.mdl"); precache_model("models/w_grenade.mdl"); +#else + precache_model("models/v_grenade.mdl"); precache_model("models/p_grenade.mdl"); +#endif } void w_handgrenade_updateammo(player pl) { diff --git a/src/shared/valve/w_hornetgun.c b/src/shared/valve/w_hornetgun.c index 1b4fa669..044b49ce 100644 --- a/src/shared/valve/w_hornetgun.c +++ b/src/shared/valve/w_hornetgun.c @@ -36,15 +36,15 @@ enum void w_hornetgun_precache(void) { - precache_model("models/v_hgun.mdl"); - precache_model("models/w_hgun.mdl"); - precache_model("models/p_hgun.mdl"); - precache_model("models/hornet.mdl"); - #ifdef SERVER Sound_Precache("weapon_hornetgun.fire"); Sound_Precache("weapon_hornetgun.buzz"); Sound_Precache("weapon_hornetgun.hit"); + precache_model("models/w_hgun.mdl"); + precache_model("models/hornet.mdl"); +#else + precache_model("models/v_hgun.mdl"); + precache_model("models/p_hgun.mdl"); #endif } diff --git a/src/shared/valve/w_mp5.c b/src/shared/valve/w_mp5.c index 31446111..ae95e4f8 100644 --- a/src/shared/valve/w_mp5.c +++ b/src/shared/valve/w_mp5.c @@ -56,12 +56,12 @@ w_mp5_precache(void) #ifdef SERVER Sound_Precache("weapon_mp5.shoot"); Sound_Precache("weapon_mp5.gl"); -#endif - - precache_model("models/v_9mmar.mdl"); precache_model("models/w_9mmar.mdl"); - precache_model("models/p_9mmar.mdl"); precache_model("models/grenade.mdl"); +#else + precache_model("models/v_9mmar.mdl"); + precache_model("models/p_9mmar.mdl"); +#endif } int diff --git a/src/shared/valve/w_python.c b/src/shared/valve/w_python.c index 71cea42b..66ff51cc 100644 --- a/src/shared/valve/w_python.c +++ b/src/shared/valve/w_python.c @@ -49,13 +49,13 @@ enum void w_python_precache(void) { - precache_model("models/v_357.mdl"); - precache_model("models/w_357.mdl"); - precache_model("models/p_357.mdl"); - #ifdef SERVER Sound_Precache("weapon_357.shoot"); Sound_Precache("weapon_357.reload"); + precache_model("models/w_357.mdl"); +#else + precache_model("models/v_357.mdl"); + precache_model("models/p_357.mdl"); #endif } diff --git a/src/shared/valve/w_rpg.c b/src/shared/valve/w_rpg.c index 5475a55b..8b64f652 100644 --- a/src/shared/valve/w_rpg.c +++ b/src/shared/valve/w_rpg.c @@ -41,12 +41,13 @@ void w_rpg_precache(void) { #ifdef SERVER Sound_Precache("weapon_rpg.shoot"); -#endif - precache_model("models/v_rpg.mdl"); precache_model("models/w_rpg.mdl"); - precache_model("models/p_rpg.mdl"); precache_model("models/rpgrocket.mdl"); +#else + precache_model("models/v_rpg.mdl"); + precache_model("models/p_rpg.mdl"); precache_model("sprites/laserdot.spr"); +#endif } void w_rpg_updateammo(player pl) diff --git a/src/shared/valve/w_satchel.c b/src/shared/valve/w_satchel.c index 0138716b..9607eaba 100644 --- a/src/shared/valve/w_satchel.c +++ b/src/shared/valve/w_satchel.c @@ -62,11 +62,12 @@ void w_satchel_precache(void) { #ifdef SERVER Sound_Precache("weapon_satchel.bounce"); -#endif precache_model("models/w_satchel.mdl"); +#else precache_model("models/v_satchel.mdl"); precache_model("models/v_satchel_radio.mdl"); precache_model("models/p_satchel.mdl"); +#endif } int w_satchel_pickup(int new, int startammo) diff --git a/src/shared/valve/w_shotgun.c b/src/shared/valve/w_shotgun.c index 8e6cc753..913b7d5e 100644 --- a/src/shared/valve/w_shotgun.c +++ b/src/shared/valve/w_shotgun.c @@ -52,11 +52,11 @@ void w_shotgun_precache(void) Sound_Precache("weapon_shotgun.double"); Sound_Precache("weapon_shotgun.reload"); Sound_Precache("weapon_shotgun.cock"); -#endif - - precache_model("models/v_shotgun.mdl"); precache_model("models/w_shotgun.mdl"); +#else + precache_model("models/v_shotgun.mdl"); precache_model("models/p_shotgun.mdl"); +#endif } void w_shotgun_updateammo(player pl) { diff --git a/src/shared/valve/w_snark.c b/src/shared/valve/w_snark.c index 5509f5d3..8804a013 100644 --- a/src/shared/valve/w_snark.c +++ b/src/shared/valve/w_snark.c @@ -241,16 +241,16 @@ void w_snark_release(void) } void w_snark_precache(void) { - precache_model("models/w_sqknest.mdl"); - precache_model("models/w_squeak.mdl"); - precache_model("models/p_squeak.mdl"); - precache_model("models/v_squeak.mdl"); - #ifdef SERVER Sound_Precache("weapon_snark.deploy"); Sound_Precache("weapon_snark.die"); Sound_Precache("weapon_snark.blast"); Sound_Precache("weapon_snark.hunt"); + precache_model("models/w_sqknest.mdl"); + precache_model("models/w_squeak.mdl"); +#else + precache_model("models/p_squeak.mdl"); + precache_model("models/v_squeak.mdl"); #endif } void w_snark_updateammo(player pl) diff --git a/src/shared/valve/w_tripmine.c b/src/shared/valve/w_tripmine.c index 76a274e0..0f3c07c1 100644 --- a/src/shared/valve/w_tripmine.c +++ b/src/shared/valve/w_tripmine.c @@ -144,13 +144,13 @@ enum void w_tripmine_precache(void) { - precache_model("models/v_tripmine.mdl"); - precache_model("models/p_tripmine.mdl"); - #ifdef SERVER Sound_Precache("weapon_tripmine.deploy"); Sound_Precache("weapon_tripmine.charge"); Sound_Precache("weapon_tripmine.activate"); + precache_model("models/v_tripmine.mdl"); +#else + precache_model("models/p_tripmine.mdl"); #endif } void w_tripmine_updateammo(player pl)