FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix flashlight in induction.

This commit is contained in:
Andrey Akhmichin 2019-12-01 17:23:00 +05:00
parent 22a953d3c6
commit 918aacad9e
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cl_dll/flashlight.cpp
View File

@ -112,12 +112,20 @@ int CHudFlashlight::Draw( float flTime )
return 1;
#ifdef MOBILE_HACKS
if( !( gHUD.m_iWeaponBits & ( 1 << ( WEAPON_SUIT ) ) )
|| ( g_iModType == MOD_INDUCTION && !( gHUD.m_iWeaponBits & ( 1 << ( WEAPON_FLASHLIGHT ) ) ) ) )
if( g_iModType == MOD_INDUCTION )
{
if( !( gHUD.m_iWeaponBits & ( 1 << ( WEAPON_FLASHLIGHT ) ) ) )
return 1;
}
else
{
if( !( gHUD.m_iWeaponBits & ( 1 << ( WEAPON_SUIT ) ) ) )
return 1;
}
#else // MOBILE_HACKS
if( !( gHUD.m_iWeaponBits & ( 1 << ( WEAPON_SUIT ) ) ) )
#endif // MOBILE_HACKS
return 1;
#endif // MOBILE_HACKS
if( m_fOn )
a = 225;

5
cl_dll/hud.cpp
View File

@ -226,6 +226,11 @@ void CHud::Init( void )
g_iModType = MOD_SEWER_BETA;
g_iHudColor = RGB_WHITISH;
}
else if( HUD_IsGame( "induction" ) )
{
g_iModType = MOD_INDUCTION;
g_iHudColor = RGB_YELLOWISH;
}
else
{
g_iModType = MOD_VALVE;

3
dlls/player.cpp
View File

@ -3296,7 +3296,8 @@ void CBasePlayer::FlashlightTurnOn( void )
}
#ifdef MOBILE_HACKS
if( (pev->weapons & ( 1 << WEAPON_SUIT ) ) || ( g_iModType == MOD_INDUCTION && (pev->weapons & ( 1 << WEAPON_FLASHLIGHT ) ) ) )
if( (g_iModType != MOD_INDUCTION && (pev->weapons & ( 1 << WEAPON_SUIT ) ) )
|| ( g_iModType == MOD_INDUCTION && (pev->weapons & ( 1 << WEAPON_FLASHLIGHT ) ) ) )
#else // MOBILE_HACKS
if( (pev->weapons & ( 1 << WEAPON_SUIT ) ) )
#endif // MOBILE_HACKS