Progs compilation fixes
This commit is contained in:
parent
ea100b0acc
commit
f39cc5138a
4 changed files with 5 additions and 20 deletions
|
@ -52,7 +52,6 @@ ClientGame_InitDone(void)
|
||||||
void
|
void
|
||||||
ClientGame_RendererRestart(string rstr)
|
ClientGame_RendererRestart(string rstr)
|
||||||
{
|
{
|
||||||
Damage_Precache();
|
|
||||||
Obituary_Precache();
|
Obituary_Precache();
|
||||||
|
|
||||||
HUD_Init();
|
HUD_Init();
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
../../../src/gs-entbase/shared.src
|
../../../src/gs-entbase/shared.src
|
||||||
../shared/include.src
|
../shared/include.src
|
||||||
../../../valve/src/client/draw.qc
|
../../../valve/src/client/draw.qc
|
||||||
../../../valve/src/client/damage.qc
|
|
||||||
../../../hl2/src/client/init.qc
|
../../../hl2/src/client/init.qc
|
||||||
../../../valve/src/client/flashlight.qc
|
../../../valve/src/client/flashlight.qc
|
||||||
../../../hl2/src/client/entities.qc
|
../../../hl2/src/client/entities.qc
|
||||||
|
@ -29,11 +28,7 @@
|
||||||
../../../hl2/src/client/viewmodel.qc
|
../../../hl2/src/client/viewmodel.qc
|
||||||
../../../valve/src/client/obituary.qc
|
../../../valve/src/client/obituary.qc
|
||||||
../../../valve/src/client/hud_sprite.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
|
../../../hl2/src/client/hud.qc
|
||||||
../../../valve/src/client/hud_weaponselect.qc
|
|
||||||
../../../valve/src/client/scoreboard.qc
|
../../../valve/src/client/scoreboard.qc
|
||||||
../../../src/client/include.src
|
../../../src/client/include.src
|
||||||
../../../valve/src/client/vgui_changeclass.qc
|
../../../valve/src/client/vgui_changeclass.qc
|
||||||
|
|
|
@ -155,7 +155,7 @@ HUD_Draw(void)
|
||||||
float fw, rt, rt_alpha;
|
float fw, rt, rt_alpha;
|
||||||
vector screenSize = screen.Size();
|
vector screenSize = screen.Size();
|
||||||
finalColor[0] = g_damageAlpha;
|
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);
|
center = screen.Mins() + (screenSize / 2);
|
||||||
|
|
||||||
/* the pos relative to the player + view_dir determines which
|
/* the pos relative to the player + view_dir determines which
|
||||||
|
@ -171,19 +171,19 @@ HUD_Draw(void)
|
||||||
|
|
||||||
if (fw < -0.25f) {
|
if (fw < -0.25f) {
|
||||||
draw.Pic(center + [70+128,-128], "textures/ui/m_lineleft",
|
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",
|
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 {
|
} else {
|
||||||
rt = dotproduct(rel_pos, v_right);
|
rt = dotproduct(rel_pos, v_right);
|
||||||
rt_alpha = fabs(rt) * g_damageAlpha;
|
rt_alpha = fabs(rt) * g_damageAlpha;
|
||||||
|
|
||||||
if (rt > 0.25f) {
|
if (rt > 0.25f) {
|
||||||
draw.Pic(center + [70+128,-128], "textures/ui/m_lineleft",
|
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) {
|
} else if (rt < -0.25f) {
|
||||||
draw.Pic(center + [-102-128,-128], "textures/ui/m_lineright",
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -199,8 +199,6 @@ hlPlayer::UpdatePlayerAttachments(bool visible)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void HUD_AmmoNotify_Check(ncPlayer pl);
|
|
||||||
void HUD_ItemNotify_Check(ncPlayer pl);
|
|
||||||
/*
|
/*
|
||||||
=================
|
=================
|
||||||
hlPlayer::ReceiveEntity
|
hlPlayer::ReceiveEntity
|
||||||
|
@ -229,13 +227,6 @@ hlPlayer::ReceiveEntity(float new, float flChanged)
|
||||||
/* do not notify us of updates when spawning initially */
|
/* do not notify us of updates when spawning initially */
|
||||||
if (flChanged == UPDATE_ALL)
|
if (flChanged == UPDATE_ALL)
|
||||||
PredictPreFrame();
|
PredictPreFrame();
|
||||||
|
|
||||||
if (flChanged & PLAYER_AMMOTYPES ) {
|
|
||||||
HUD_AmmoNotify_Check(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flChanged & PLAYER_ITEMS || flChanged & PLAYER_HEALTH)
|
|
||||||
HUD_ItemNotify_Check(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue