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:28:41 -05:00
parent afe9f41508
commit 14deb350cf
265 changed files with 904 additions and 947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cl_dll/fx_sparks.cpp
View File

@ -1148,9 +1148,9 @@ void FX_Explosion( Vector& origin, Vector& normal, char materialType )
pParticle->m_flRollDelta = random->RandomFloat( 0, 360 );
float colorRamp = random->RandomFloat( 0.75f, 1.5f );
pParticle->m_uchColor[0] = min( 1.0f, r*colorRamp )*255.0f;
pParticle->m_uchColor[1] = min( 1.0f, g*colorRamp )*255.0f;
pParticle->m_uchColor[2] = min( 1.0f, b*colorRamp )*255.0f;
pParticle->m_uchColor[0] = MIN( 1.0f, r*colorRamp )*255.0f;
pParticle->m_uchColor[1] = MIN( 1.0f, g*colorRamp )*255.0f;
pParticle->m_uchColor[2] = MIN( 1.0f, b*colorRamp )*255.0f;
}
}
@ -1171,9 +1171,9 @@ void FX_Explosion( Vector& origin, Vector& normal, char materialType )
pSphereParticle->m_vecVelocity = Vector(0,0,0);
float colorRamp = random->RandomFloat( 0.75f, 1.5f );
pSphereParticle->m_uchColor[0] = min( 1.0f, r*colorRamp )*255.0f;
pSphereParticle->m_uchColor[1] = min( 1.0f, g*colorRamp )*255.0f;
pSphereParticle->m_uchColor[2] = min( 1.0f, b*colorRamp )*255.0f;
pSphereParticle->m_uchColor[0] = MIN( 1.0f, r*colorRamp )*255.0f;
pSphereParticle->m_uchColor[1] = MIN( 1.0f, g*colorRamp )*255.0f;
pSphereParticle->m_uchColor[2] = MIN( 1.0f, b*colorRamp )*255.0f;
}
// Throw some smoke balls out around the normal
@ -1200,9 +1200,9 @@ void FX_Explosion( Vector& origin, Vector& normal, char materialType )
pParticle->m_vecVelocity = (vecRight*x + vecUp*y) * 1024.0;
float colorRamp = random->RandomFloat( 0.75f, 1.5f );
pParticle->m_uchColor[0] = min( 1.0f, r*colorRamp )*255.0f;
pParticle->m_uchColor[1] = min( 1.0f, g*colorRamp )*255.0f;
pParticle->m_uchColor[2] = min( 1.0f, b*colorRamp )*255.0f;
pParticle->m_uchColor[0] = MIN( 1.0f, r*colorRamp )*255.0f;
pParticle->m_uchColor[1] = MIN( 1.0f, g*colorRamp )*255.0f;
pParticle->m_uchColor[2] = MIN( 1.0f, b*colorRamp )*255.0f;
}
}
@ -1230,9 +1230,9 @@ void FX_Explosion( Vector& origin, Vector& normal, char materialType )
pParticle->m_flRollDelta = random->RandomFloat( -1, 1 );
float colorRamp = random->RandomFloat( 0.5f, 1.25f );
pParticle->m_uchColor[0] = min( 1.0f, r*colorRamp )*255.0f;
pParticle->m_uchColor[1] = min( 1.0f, g*colorRamp )*255.0f;
pParticle->m_uchColor[2] = min( 1.0f, b*colorRamp )*255.0f;
pParticle->m_uchColor[0] = MIN( 1.0f, r*colorRamp )*255.0f;
pParticle->m_uchColor[1] = MIN( 1.0f, g*colorRamp )*255.0f;
pParticle->m_uchColor[2] = MIN( 1.0f, b*colorRamp )*255.0f;
}
}