H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2025-12-18 18:00:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

game: More More More max()->MAX() and min()->MIN()

Browse Source
This commit is contained in:
SanyaSho 2022-08-10 22:18:42 +03:00
parent d330813654
commit a6d7b5d63b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
game/client/tf2base/tf_hud_demomancharge.cpp
View File

@ -124,8 +124,8 @@ void CHudDemomanChargeMeter::OnTick( void )
if ( flChargeBeginTime > 0 ) if ( flChargeBeginTime > 0 )
{ {
float flTimeCharged = max( 0, gpGlobals->curtime - flChargeBeginTime ); float flTimeCharged = MAX( 0, gpGlobals->curtime - flChargeBeginTime );
float flPercentCharged = min( 1.0, flTimeCharged / flChargeMaxTime ); float flPercentCharged = MIN( 1.0, flTimeCharged / flChargeMaxTime );
m_pChargeMeter->SetProgress( flPercentCharged ); m_pChargeMeter->SetProgress( flPercentCharged );
} }
@ -135,4 +135,4 @@ void CHudDemomanChargeMeter::OnTick( void )
} }
} }
} }
} }

2
game/shared/tf2base/tf_weapon_flamethrower.cpp
View File

@ -948,7 +948,7 @@ void CTFFlameEntity::OnCollide( CBaseEntity *pOther )
flMultiplier = RemapValClamped( flDistance, tf_flamethrower_maxdamagedist.GetFloat()/2, tf_flamethrower_maxdamagedist.GetFloat(), 1.0, 0.25 ); flMultiplier = RemapValClamped( flDistance, tf_flamethrower_maxdamagedist.GetFloat()/2, tf_flamethrower_maxdamagedist.GetFloat(), 1.0, 0.25 );
} }
float flDamage = m_flDmgAmount * flMultiplier; float flDamage = m_flDmgAmount * flMultiplier;
flDamage = max( flDamage, 1.0 ); flDamage = MAX( flDamage, 1.0 );
if ( tf_debug_flamethrower.GetInt() ) if ( tf_debug_flamethrower.GetInt() )
{ {
Msg( "Flame touch dmg: %.1f\n", flDamage ); Msg( "Flame touch dmg: %.1f\n", flDamage );