Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 12:36:05 +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:30:09 -05:00
parent b9b7f08197
commit 3e7f7bdabd
300 changed files with 1041 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
game/server/basecombatcharacter.cpp
View File

@ -619,7 +619,7 @@ CProp_Portal* CBaseCombatCharacter::FInViewConeThroughPortal( const Vector &vecS
float flDot = DotProduct( los, facingDir );
// Use the tougher FOV of either the standard FOV or FOV clipped to the portal hole
if ( flDot > max( fFOVThroughPortal, m_flFieldOfView ) )
if ( flDot > MAX( fFOVThroughPortal, m_flFieldOfView ) )
{
float fActualDist = ptEyePosition.DistToSqr( vTranslatedVecSpot );
if( fActualDist < fDistToBeat )
@ -2862,7 +2862,7 @@ int CBaseCombatCharacter::GiveAmmo( int iCount, int iAmmoIndex, bool bSuppressSo
return 0;
int iMax = GetAmmoDef()->MaxCarry(iAmmoIndex);
int iAdd = min( iCount, iMax - m_iAmmo[iAmmoIndex] );
int iAdd = MIN( iCount, iMax - m_iAmmo[iAmmoIndex] );
if ( iAdd < 1 )
return 0;
@ -3072,7 +3072,7 @@ void RadiusDamage( const CTakeDamageInfo &info, const Vector &vecSrc, float flRa
{
// Even the tiniest explosion gets attention. Don't let the radius
// be less than 128 units.
float soundRadius = max( 128.0f, flRadius * 1.5 );
float soundRadius = MAX( 128.0f, flRadius * 1.5 );
CSoundEnt::InsertSound( SOUND_COMBAT | SOUND_CONTEXT_EXPLOSION, vecSrc, (int)soundRadius, 0.25, info.GetInflictor() );
}