Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 20:16:10 +08:00
Code Activity

Fixed conflict between min/max macros and std::min/max when using GCC >= 4.2.

Browse Source
This commit is contained in:
Scott Ehlert
2011-04-28 01:29:22 -05:00
parent 88dd2ac536
commit 7f4855ae1f
265 changed files with 904 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cl_dll/fx_discreetline.cpp
View File

@ -76,8 +76,8 @@ void CFXDiscreetLine::Draw( double frametime )
float eDistance = sDistance - m_fLength;
//Clip to start
sDistance = max( 0.0f, sDistance );
eDistance = max( 0.0f, eDistance );
sDistance = MAX( 0.0f, sDistance );
eDistance = MAX( 0.0f, eDistance );
if ( ( sDistance == 0.0f ) && ( eDistance == 0.0f ) )
return;
@ -85,8 +85,8 @@ void CFXDiscreetLine::Draw( double frametime )
// Clip it
if ( m_fClipLength != 0.0f )
{
sDistance = min( sDistance, m_fClipLength );
eDistance = min( eDistance, m_fClipLength );
sDistance = MIN( sDistance, m_fClipLength );
eDistance = MIN( eDistance, m_fClipLength );
}
// Get our delta to calculate the tc offset