From 918aacad9e58ced06a64736450a83318d9be2ec9 Mon Sep 17 00:00:00 2001 From: Andrey Akhmichin Date: Sun, 1 Dec 2019 17:23:00 +0500 Subject: [PATCH] Fix flashlight in induction. --- cl_dll/flashlight.cpp | 14 +++++++++++--- cl_dll/hud.cpp | 5 +++++ dlls/player.cpp | 3 ++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/cl_dll/flashlight.cpp b/cl_dll/flashlight.cpp index 57bf87cb..bdcb1e23 100644 --- a/cl_dll/flashlight.cpp +++ b/cl_dll/flashlight.cpp @@ -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; diff --git a/cl_dll/hud.cpp b/cl_dll/hud.cpp index 36629652..158975c6 100644 --- a/cl_dll/hud.cpp +++ b/cl_dll/hud.cpp @@ -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; diff --git a/dlls/player.cpp b/dlls/player.cpp index 515d6893..da3d4c5a 100644 --- a/dlls/player.cpp +++ b/dlls/player.cpp @@ -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