FWGS/hlsdk-xash3d
2
0
Fork 0
mirror of https://github.com/FWGS/hlsdk-xash3d synced 2024-11-12 05:10:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into visitors

Browse Source
This commit is contained in:
Night Owl 2018-07-16 04:45:10 +05:00
commit 1f7e5bc9d3
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cl_dll/flashlight.cpp
View File

@ -108,6 +108,9 @@ int CHudFlashlight::Draw( float flTime )
int r, g, b, x, y, a;
wrect_t rc;
if( gEngfuncs.IsSpectateOnly() )
return 1;
if( !( gHUD.m_iWeaponBits & ( 1 << ( WEAPON_FLASHLIGHT ) ) ) )
return 1;

8
dlls/lights.cpp
View File

@ -155,10 +155,10 @@ void CEnvLight::KeyValue( KeyValueData* pkvd )
}
else if( j == 4 )
{
v /= 255;
r *= v;
g *= v;
b *= v;
float vf = v / 255.0f;
r *= vf;
g *= vf;
b *= vf;
}
// simulate qrad direct, ambient,and gamma adjustments, as well as engine scaling

2
dlls/player.cpp
View File

@ -1417,7 +1417,7 @@ void CBasePlayer::StartObserver( Vector vecPosition, Vector vecViewAngle )
MESSAGE_END();
// Setup flags
m_iHideHUD = ( HIDEHUD_HEALTH | HIDEHUD_WEAPONS );
m_iHideHUD = ( HIDEHUD_HEALTH | HIDEHUD_FLASHLIGHT | HIDEHUD_WEAPONS );
m_afPhysicsFlags |= PFLAG_OBSERVER;
pev->effects = EF_NODRAW;
pev->view_ofs = g_vecZero;