Backups/hl2sdk
1
0 Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2026-10-11 10:08:01 +08:00
Code Issues Packages Projects Releases Wiki 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 committed 2011-04-28 01:30:09 -05:00
1 parent b9b7f08197
commit 3e7f7bdabd
300 files changed
+1041 -1084
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

game/shared/particlesystemquery.cpp
+4 -4
View File
@@ -236,7 +236,7 @@ void CParticleSystemQuery::GetRandomPointsOnControllingObjectHitBox(
int nHitbox = 0;
int nNumIters = nNumTrysToGetAPointInsideTheModel;
if (! vecDirectionalBias.IsZero( 0.0001 ) )
nNumIters = max( nNumIters, 5 );
nNumIters = MAX( nNumIters, 5 );
for( int i=0 ; i < nNumPtsOut; i++)
{
@@ -313,7 +313,7 @@ void CParticleSystemQuery::GetRandomPointsOnControllingObjectHitBox(
int nHitbox = 0;
int nNumIters = nNumTrysToGetAPointInsideTheModel;
if (! vecDirectionalBias.IsZero( 0.0001 ) )
nNumIters = max( nNumIters, 5 );
nNumIters = MAX( nNumIters, 5 );
for( int i=0 ; i < nNumPtsOut; i++)
{
@@ -421,7 +421,7 @@ int CParticleSystemQuery::GetControllingObjectHitBoxInfo(
if ( set )
{
nRet = min( nBufSize, set->numhitboxes );
nRet = MIN( nBufSize, set->numhitboxes );
for( int i=0 ; i < nRet; i++ )
{
mstudiobbox_t *pBox = set->pHitbox( i );
@@ -613,7 +613,7 @@ float CParticleSystemQuery::GetPixelVisibility( int *pQueryHandle, const Vector
pixelvis_queryparams_t params;
params.Init( vecOrigin, flScale, 1.0 );
float flVisibility = PixelVisibility_FractionVisible( params, pQueryHandle );
flVisibility = max( 0.0f, flVisibility );
flVisibility = MAX( 0.0f, flVisibility );
return flVisibility;
#else
return 0.0f;