Backups/hl2sdk
1
0 Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2026-10-12 05:28: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

utils/vrad/vrad.cpp
+4 -4
View File
@@ -283,7 +283,7 @@ void ReadLightFile (char *filename)
texlights[j].filename = filename;
file_texlights ++;
num_texlights = max( num_texlights, j + 1 );
num_texlights = MAX( num_texlights, j + 1 );
}
}
qprintf ( "[%i texlights parsed from '%s']\n\n", file_texlights, filename);
@@ -818,7 +818,7 @@ int CreateChildPatch( int nParentIndex, winding_t *pWinding, float flArea, const
if ( (child->face_maxs[i] == child->maxs[i] || child->face_mins[i] == child->mins[i] )
&& total[i] > minchop )
{
child->chop = max( minchop, child->chop / 2 );
child->chop = MAX( minchop, child->chop / 2 );
break;
}
}
@@ -878,7 +878,7 @@ void SubdividePatch( int ndxPatch )
if (patch->chop > minchop)
{
bSubdivide = true;
patch->chop = max( minchop, patch->chop / 2 );
patch->chop = MAX( minchop, patch->chop / 2 );
}
}
}
@@ -2619,7 +2619,7 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
Warning("Error: expected positive value after '-chop'\n" );
return 1;
}
minchop = min( minchop, maxchop );
minchop = MIN( minchop, maxchop );
}
else
{