Backups/hl2sdk
1
0 Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2026-10-11 12:28:00 +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/props_shared.cpp
+3 -3
View File
@@ -480,7 +480,7 @@ const char *CPropData::GetRandomChunkModel( const char *pszBreakableSection, int
else
{
// Don't pick anything over the specified size
iRandom = RandomInt( 0, min(iMaxSize, m_BreakableChunks[i].iszChunkModels.Count()-1) );
iRandom = RandomInt( 0, MIN(iMaxSize, m_BreakableChunks[i].iszChunkModels.Count()-1) );
}
return STRING(m_BreakableChunks[i].iszChunkModels[iRandom]);
@@ -913,7 +913,7 @@ void PropBreakableCreateAll( int modelindex, IPhysicsObject *pPhysics, const bre
{
if ( iPrecomputedBreakableCount != -1 )
{
iPrecomputedBreakableCount = min( iMaxBreakCount, iPrecomputedBreakableCount );
iPrecomputedBreakableCount = MIN( iMaxBreakCount, iPrecomputedBreakableCount );
}
else
{
@@ -1299,7 +1299,7 @@ CBaseEntity *CreateGibsFromList( CUtlVector<breakmodel_t> &list, int modelindex,
{
if ( iPrecomputedBreakableCount != -1 )
{
iPrecomputedBreakableCount = min( iMaxBreakCount, iPrecomputedBreakableCount );
iPrecomputedBreakableCount = MIN( iMaxBreakCount, iPrecomputedBreakableCount );
}
else
{