diff --git a/src/client/init.qc b/src/client/init.qc index 0f34fbe..5f0b36d 100644 --- a/src/client/init.qc +++ b/src/client/init.qc @@ -52,7 +52,6 @@ ClientGame_InitDone(void) void ClientGame_RendererRestart(string rstr) { - Damage_Precache(); Obituary_Precache(); HUD_Init(); diff --git a/src/client/progs.src b/src/client/progs.src index 91b4569..8dbfda6 100644 --- a/src/client/progs.src +++ b/src/client/progs.src @@ -18,7 +18,6 @@ ../../../src/gs-entbase/shared.src ../shared/include.src ../../../valve/src/client/draw.qc -../../../valve/src/client/damage.qc ../../../hl2/src/client/init.qc ../../../valve/src/client/flashlight.qc ../../../hl2/src/client/entities.qc @@ -29,11 +28,7 @@ ../../../hl2/src/client/viewmodel.qc ../../../valve/src/client/obituary.qc ../../../valve/src/client/hud_sprite.qc -../../../valve/src/client/hud_itemnotify.qc -../../../valve/src/client/hud_dmgnotify.qc -../../../valve/src/client/hud_ammonotify.qc ../../../hl2/src/client/hud.qc -../../../valve/src/client/hud_weaponselect.qc ../../../valve/src/client/scoreboard.qc ../../../src/client/include.src ../../../valve/src/client/vgui_changeclass.qc diff --git a/src/hud/hud.qc b/src/hud/hud.qc index 7974e87..f9d22d3 100644 --- a/src/hud/hud.qc +++ b/src/hud/hud.qc @@ -155,7 +155,7 @@ HUD_Draw(void) float fw, rt, rt_alpha; vector screenSize = screen.Size(); finalColor[0] = g_damageAlpha; - draw.Pic(screen.Mins(), "fade_additive", screenSize, finalColor, 1.0); + draw.Pic(screen.Mins(), "fade_additive", screenSize, finalColor, 1.0, 0); center = screen.Mins() + (screenSize / 2); /* the pos relative to the player + view_dir determines which @@ -171,19 +171,19 @@ HUD_Draw(void) if (fw < -0.25f) { draw.Pic(center + [70+128,-128], "textures/ui/m_lineleft", - [96,256], [1,0,0], g_damageAlpha); + [96,256], [1,0,0], g_damageAlpha, 0); draw.Pic(center + [-102-128,-128], "textures/ui/m_lineright", - [96,256], [1,0,0], g_damageAlpha); + [96,256], [1,0,0], g_damageAlpha, 0); } else { rt = dotproduct(rel_pos, v_right); rt_alpha = fabs(rt) * g_damageAlpha; if (rt > 0.25f) { draw.Pic(center + [70+128,-128], "textures/ui/m_lineleft", - [96,256], [1,0,0], rt_alpha); + [96,256], [1,0,0], rt_alpha, 0); } else if (rt < -0.25f) { draw.Pic(center + [-102-128,-128], "textures/ui/m_lineright", - [96,256], [1,0,0], rt_alpha); + [96,256], [1,0,0], rt_alpha, 0); } } } diff --git a/src/shared/HL2Player.qc b/src/shared/HL2Player.qc index 7827ada..92c39a5 100644 --- a/src/shared/HL2Player.qc +++ b/src/shared/HL2Player.qc @@ -199,8 +199,6 @@ hlPlayer::UpdatePlayerAttachments(bool visible) } } -void HUD_AmmoNotify_Check(ncPlayer pl); -void HUD_ItemNotify_Check(ncPlayer pl); /* ================= hlPlayer::ReceiveEntity @@ -229,13 +227,6 @@ hlPlayer::ReceiveEntity(float new, float flChanged) /* do not notify us of updates when spawning initially */ if (flChanged == UPDATE_ALL) PredictPreFrame(); - - if (flChanged & PLAYER_AMMOTYPES ) { - HUD_AmmoNotify_Check(this); - } - - if (flChanged & PLAYER_ITEMS || flChanged & PLAYER_HEALTH) - HUD_ItemNotify_Check(this); } /*