mirror of
https://github.com/alliedmodders/hl2sdk.git
synced 2026-10-11 03:48:00 +08:00
Fixed conflict between min/max macros and std::min/max when using GCC >= 4.2.
This commit is contained in:
1 parent
d529bf38f5
commit
85773fe42c
300 files changed
+1041
-1084
No files matched your search
@@ -1268,7 +1268,7 @@ void CPointCommentaryNode::UpdateViewPostThink( void )
|
||||
{
|
||||
// Blend back to the player's position over time.
|
||||
float flCurTime = (gpGlobals->curtime - m_flFinishedTime);
|
||||
float flTimeToBlend = min( 2.0, m_flFinishedTime - m_flStartTime );
|
||||
float flTimeToBlend = MIN( 2.0, m_flFinishedTime - m_flStartTime );
|
||||
float flBlendPerc = 1.0 - clamp( flCurTime / flTimeToBlend, 0, 1 );
|
||||
|
||||
//Msg("OUT: CurTime %.2f, BlendTime: %.2f, Blend: %.3f\n", flCurTime, flTimeToBlend, flBlendPerc );
|
||||
|
||||
Reference in new issue
Block a user