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

2
cl_dll/particles_simple.cpp
View File

@ -556,7 +556,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 );