mirror of
https://github.com/alliedmodders/hl2sdk.git
synced 2026-10-12 03:28: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
6c38e2e589
commit
4caefcbcba
300 files changed
+1041
-1084
No files matched your search
@@ -526,7 +526,7 @@ Vector CFireParticle::UpdateColor( const SimpleParticle *pParticle )
|
||||
for ( int i = 0; i < 3; i++ )
|
||||
{
|
||||
//FIXME: This is frame dependant... but I don't want to store off start/end colors yet
|
||||
//pParticle->m_uchColor[i] = max( 0, pParticle->m_uchColor[i]-2 );
|
||||
//pParticle->m_uchColor[i] = MAX( 0, pParticle->m_uchColor[i]-2 );
|
||||
}
|
||||
|
||||
return CSimpleEmitter::UpdateColor( pParticle );
|
||||
|
||||
Reference in new issue
Block a user