mirror of
https://github.com/YGGverse/hlsdk-portable.git
synced 2025-01-11 23:47:53 +00:00
Merge branch 'master' into bshift
This commit is contained in:
commit
8199f7d23c
@ -108,6 +108,9 @@ int CHudFlashlight::Draw( float flTime )
|
|||||||
int r, g, b, x, y, a;
|
int r, g, b, x, y, a;
|
||||||
wrect_t rc;
|
wrect_t rc;
|
||||||
|
|
||||||
|
if( gEngfuncs.IsSpectateOnly() )
|
||||||
|
return 1;
|
||||||
|
|
||||||
if( !( gHUD.m_iWeaponBits & ( 1 << ( WEAPON_SUIT ) ) ) )
|
if( !( gHUD.m_iWeaponBits & ( 1 << ( WEAPON_SUIT ) ) ) )
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
|
@ -155,10 +155,10 @@ void CEnvLight::KeyValue( KeyValueData* pkvd )
|
|||||||
}
|
}
|
||||||
else if( j == 4 )
|
else if( j == 4 )
|
||||||
{
|
{
|
||||||
v /= 255;
|
float vf = v / 255.0f;
|
||||||
r *= v;
|
r *= vf;
|
||||||
g *= v;
|
g *= vf;
|
||||||
b *= v;
|
b *= vf;
|
||||||
}
|
}
|
||||||
|
|
||||||
// simulate qrad direct, ambient,and gamma adjustments, as well as engine scaling
|
// simulate qrad direct, ambient,and gamma adjustments, as well as engine scaling
|
||||||
|
@ -1421,7 +1421,7 @@ void CBasePlayer::StartObserver( Vector vecPosition, Vector vecViewAngle )
|
|||||||
MESSAGE_END();
|
MESSAGE_END();
|
||||||
|
|
||||||
// Setup flags
|
// Setup flags
|
||||||
m_iHideHUD = ( HIDEHUD_HEALTH | HIDEHUD_WEAPONS );
|
m_iHideHUD = ( HIDEHUD_HEALTH | HIDEHUD_FLASHLIGHT | HIDEHUD_WEAPONS );
|
||||||
m_afPhysicsFlags |= PFLAG_OBSERVER;
|
m_afPhysicsFlags |= PFLAG_OBSERVER;
|
||||||
pev->effects = EF_NODRAW;
|
pev->effects = EF_NODRAW;
|
||||||
pev->view_ofs = g_vecZero;
|
pev->view_ofs = g_vecZero;
|
||||||
|
Loading…
Reference in New Issue
Block a user