--- mod/src/cl_dll/c_baseanimating.cpp 22 Apr 2006 18:46:55 -0000 1.6 +++ mod/src/cl_dll/c_baseanimating.cpp 22 Jul 2006 21:12:26 -0000 @@ -486,7 +486,7 @@ int iAlpha = GetRenderColor().a; int iFadeSpeed = ( g_RagdollLVManager.IsLowViolence() ) ? g_ragdoll_lvfadespeed.GetInt() : g_ragdoll_fadespeed.GetInt(); - iAlpha = max( iAlpha - ( iFadeSpeed * gpGlobals->frametime ), 0 ); + iAlpha = max( iAlpha - ( iFadeSpeed * gpGlobals->frametime ), 0.0f ); SetRenderMode( kRenderTransAlpha ); SetRenderColorA( iAlpha ); @@ -895,7 +895,7 @@ SetPoseParameter( i, 0.0 ); } - int boneControllerCount = min( hdr->numbonecontrollers, ARRAYSIZE( m_flEncodedController ) ); + int boneControllerCount = min( hdr->numbonecontrollers, (int)ARRAYSIZE( m_flEncodedController ) ); m_iv_flEncodedController.SetMaxCount( boneControllerCount ); @@ -1829,7 +1829,7 @@ VectorMA( pTarget->est.pos, pTarget->est.height, up, p1 ); VectorMA( pTarget->est.pos, -pTarget->est.height, up, p2 ); - float r = max( pTarget->est.radius, 1); + float r = max( pTarget->est.radius, 1.0f); // don't IK to other characters ray.Init( p1, p2, Vector(-r,-r,0), Vector(r,r,1) ); --- mod/src/cl_dll/c_fire_smoke.cpp 21 Feb 2006 01:58:31 -0000 1.2 +++ mod/src/cl_dll/c_fire_smoke.cpp 22 Jul 2006 21:12:26 -0000 @@ -451,7 +451,7 @@ //NOTENOTE: Sprite renderer assumes a scale of 0.0 means 1.0 if ( m_bFadingOut == false ) { - m_entFlames[i].SetScale( max(0.000001,newScale) ); + m_entFlames[i].SetScale( max(0.000001f,newScale) ); } else { --- mod/src/cl_dll/c_impact_effects.cpp 18 Feb 2005 04:45:43 -0000 1.1.1.1 +++ mod/src/cl_dll/c_impact_effects.cpp 22 Jul 2006 21:12:26 -0000 @@ -147,7 +147,7 @@ // Handle increased scale float flMaxSpeed = FLECK_MAX_SPEED * iScale; - float flAngularSpray = max( 0.2, FLECK_ANGULAR_SPRAY - ( (float)iScale * 0.2f) ); // More power makes the spray more controlled + float flAngularSpray = max( 0.2f, FLECK_ANGULAR_SPRAY - ( (float)iScale * 0.2f) ); // More power makes the spray more controlled // Setup our collision information fleckEmitter->m_ParticleCollision.Setup( spawnOffset, &trace->plane.normal, flAngularSpray, FLECK_MIN_SPEED, flMaxSpeed, FLECK_GRAVITY, FLECK_DAMPEN ); --- mod/src/cl_dll/c_plasma.cpp 18 Feb 2005 04:45:43 -0000 1.1.1.1 +++ mod/src/cl_dll/c_plasma.cpp 22 Jul 2006 21:12:26 -0000 @@ -407,7 +407,7 @@ offset[2] = m_entFlames[i].GetAbsOrigin()[2]; // Note: Sprite render assumes 0 scale means 1.0 - m_entFlames[i].SetScale ( max(0.000001,newScale) ); + m_entFlames[i].SetScale ( max(0.000001f,newScale) ); if ( i != 0 ) { --- mod/src/cl_dll/c_te_legacytempents.cpp 21 Feb 2006 01:58:32 -0000 1.3 +++ mod/src/cl_dll/c_te_legacytempents.cpp 22 Jul 2006 21:12:26 -0000 @@ -177,8 +177,8 @@ float flDot = DotProduct( m_vecNormal, vecDelta ); if ( flDot > 0 ) { - float flAlpha = RemapVal( min(flDot,0.3), 0, 0.3, 0, 1 ); - flAlpha = max( 1.0, tempent_renderamt - (tempent_renderamt * flAlpha) ); + float flAlpha = RemapVal( min(flDot,0.3f), 0, 0.3, 0, 1 ); + flAlpha = max( 1.0f, tempent_renderamt - (tempent_renderamt * flAlpha) ); SetRenderColorA( flAlpha ); } } --- mod/src/cl_dll/detailobjectsystem.cpp 21 Feb 2006 01:58:33 -0000 1.2 +++ mod/src/cl_dll/detailobjectsystem.cpp 22 Jul 2006 21:12:26 -0000 @@ -676,8 +676,8 @@ { if ( GetDetailController() ) { - cl_detailfade.SetValue( min( m_flDefaultFadeStart, GetDetailController()->m_flFadeStartDist ) ); - cl_detaildist.SetValue( min( m_flDefaultFadeEnd, GetDetailController()->m_flFadeEndDist ) ); + cl_detailfade.SetValue( min( m_flDefaultFadeStart, (float)GetDetailController()->m_flFadeStartDist ) ); + cl_detaildist.SetValue( min( m_flDefaultFadeEnd, (float)GetDetailController()->m_flFadeEndDist ) ); } else { --- mod/src/cl_dll/fx.cpp 18 Feb 2005 04:45:44 -0000 1.1.1.1 +++ mod/src/cl_dll/fx.cpp 22 Jul 2006 21:12:26 -0000 @@ -573,8 +573,8 @@ int color[3][2]; for( int i = 0; i < 3; ++i ) { - color[i][0] = max( 0, m_SpurtColor[i] - 64 ); - color[i][1] = min( 255, m_SpurtColor[i] + 64 ); + color[i][0] = max( 0.0f, m_SpurtColor[i] - 64 ); + color[i][1] = min( 255.0f, m_SpurtColor[i] + 64 ); } pParticle->m_uchColor[0] = random->RandomInt( color[0][0], color[0][1] ); pParticle->m_uchColor[1] = random->RandomInt( color[1][0], color[1][1] ); --- mod/src/cl_dll/history_resource.cpp 21 Feb 2006 01:58:33 -0000 1.2 +++ mod/src/cl_dll/history_resource.cpp 22 Jul 2006 21:12:27 -0000 @@ -293,7 +293,7 @@ float elapsed = m_PickupHistory[i].DisplayTime - gpGlobals->curtime; float scale = elapsed * 80; Color clr = gHUD.m_clrNormal; - clr[3] = min( scale, 255 ); + clr[3] = min( scale, 255.0f ); bool bUseAmmoFullMsg = false; @@ -316,7 +316,7 @@ bUseAmmoFullMsg = true; // display as red clr = gHUD.m_clrCaution; - clr[3] = min( scale, 255 ); + clr[3] = min( scale, 255.0f ); } break; @@ -330,7 +330,7 @@ { // if the weapon doesn't have ammo, display it as red clr = gHUD.m_clrCaution; - clr[3] = min( scale, 255 ); + clr[3] = min( scale, 255.0f ); } itemIcon = pWeapon->GetSpriteInactive(); --- mod/src/cl_dll/lamphaloproxy.cpp 18 Feb 2005 04:45:45 -0000 1.1.1.1 +++ mod/src/cl_dll/lamphaloproxy.cpp 22 Jul 2006 21:12:27 -0000 @@ -91,7 +91,7 @@ } else { - fade = min( (fade - 0.25) * 1.35, 1.0f ); + fade = min( (fade - 0.25f) * 1.35f, 1.0f ); } m_pFadeValue->SetFloatValue( fade ); --- mod/src/cl_dll/smoke_fog_overlay.cpp 18 Feb 2005 04:45:45 -0000 1.1.1.1 +++ mod/src/cl_dll/smoke_fog_overlay.cpp 22 Jul 2006 21:12:27 -0000 @@ -74,10 +74,10 @@ static float dist = 10; Vector vColor = g_SmokeFogOverlayColor; - vColor.x = min(max(vColor.x, 0), 1); - vColor.y = min(max(vColor.y, 0), 1); - vColor.z = min(max(vColor.z, 0), 1); - float alpha = min(max(g_SmokeFogOverlayAlpha, 0), 1); + vColor.x = clamp(vColor.x, 0.0f, 1.0f); + vColor.y = clamp(vColor.y, 0.0f, 1.0f); + vColor.z = clamp(vColor.z, 0.0f, 1.0f); + float alpha = clamp(g_SmokeFogOverlayAlpha, 0.0f, 1.0f); meshBuilder.Begin( pMesh, MATERIAL_QUADS, 1 ); --- mod/src/cl_dll/vgui_netgraphpanel.cpp 18 Feb 2005 04:45:46 -0000 1.1.1.1 +++ mod/src/cl_dll/vgui_netgraphpanel.cpp 22 Jul 2006 21:12:27 -0000 @@ -390,7 +390,7 @@ for (a=0 ; aParmValue("-particles", -1); if ( p >= 0 ) { - m_nNumBeamTrails = max( p, MIN_PARTICLES ); + m_nNumBeamTrails = max( p, (int)MIN_PARTICLES ); } else { --- mod/src/cl_dll/view_effects.cpp 18 Feb 2005 04:45:46 -0000 1.1.1.1 +++ mod/src/cl_dll/view_effects.cpp 22 Jul 2006 21:12:27 -0000 @@ -507,7 +507,7 @@ { iFadeAlpha += pFade->alpha; } - iFadeAlpha = min( iFadeAlpha, pFade->alpha ); + iFadeAlpha = min( iFadeAlpha, (int)pFade->alpha ); iFadeAlpha = max( 0, iFadeAlpha ); } else --- mod/src/cl_dll/hl2_hud/c_basehlplayer.cpp 17 Jun 2006 18:05:01 -0000 1.4 +++ mod/src/cl_dll/hl2_hud/c_basehlplayer.cpp 22 Jul 2006 21:12:27 -0000 @@ -85,7 +85,7 @@ float flFOVOffset = BaseClass::GetFOV() + GetZoom(); // Clamp FOV in MP - int min_fov = ( gpGlobals->maxClients == 1 ) ? 5 : default_fov.GetInt(); + float min_fov = ( gpGlobals->maxClients == 1 ) ? 5 : default_fov.GetInt(); // Don't let it go too low flFOVOffset = max( min_fov, flFOVOffset ); --- mod/src/cl_dll/hl2_hud/hud_credits.cpp 18 Feb 2005 04:45:46 -0000 1.1.1.1 +++ mod/src/cl_dll/hl2_hud/hud_credits.cpp 22 Jul 2006 21:12:27 -0000 @@ -353,7 +353,7 @@ { float flDeltaTime = ( m_flFadeTime - gpGlobals->curtime ); - m_Alpha = max( 0, RemapValClamped( flDeltaTime, 5.0f, 0, -128, 255 ) ); + m_Alpha = max( 0.0f, RemapValClamped( flDeltaTime, 5.0f, 0, -128, 255 ) ); if ( flDeltaTime <= 0.0f ) { --- mod/src/cl_dll/hl2mp/c_hl2mp_player.cpp 17 Jun 2006 18:05:01 -0000 1.8 +++ mod/src/cl_dll/hl2mp/c_hl2mp_player.cpp 22 Jul 2006 21:12:27 -0000 @@ -529,7 +529,7 @@ float flFOVOffset = C_BasePlayer::GetFOV() + GetZoom(); // Clamp FOV in MP - int min_fov = GetMinFOV(); + float min_fov = GetMinFOV(); // Don't let it go too low flFOVOffset = max( min_fov, flFOVOffset ); --- mod/src/game_shared/soundenvelope.cpp 21 Feb 2006 01:58:40 -0000 1.2 +++ mod/src/game_shared/soundenvelope.cpp 22 Jul 2006 21:12:28 -0000 @@ -77,7 +77,7 @@ if ( deltaValue && deltaTime > 0 ) { m_target = target; - m_rate = max( 0.1, fabs(deltaValue / deltaTime) ); + m_rate = std::max( 0.1f, fabs(deltaValue / deltaTime) ); } else { --- mod/src/public/minmax.h 16 Oct 2005 16:26:33 -0000 1.2 +++ mod/src/public/minmax.h 22 Jul 2006 21:12:29 -0000 @@ -14,7 +14,22 @@ // Avoid #define macros when a function will suffice! #include +#include + using std::max; using std::min; +template +T clamp(T const& val, T const& minVal, T const& maxVal) { + assert(minVal < maxVal); + + if (val < minVal) { + return minVal; + } else if (val > maxVal) { + return maxVal; + } else { + return val; + } +} + #endif // MINMAX_H --- mod/src/public/tier0/basetypes.h 29 Sep 2005 03:52:40 -0000 1.3 +++ mod/src/public/tier0/basetypes.h 22 Jul 2006 21:12:29 -0000 @@ -49,29 +49,6 @@ // In case this ever changes #define M_PI 3.14159265358979323846 -#if !defined(__GNUC__) - #ifndef min - #define min(a,b) (((a) < (b)) ? (a) : (b)) - #endif - - #ifndef max - #define max(a,b) (((a) > (b)) ? (a) : (b)) - #endif -#endif - -#ifdef __cplusplus - template< class T > - inline T clamp( T const &val, T const &minVal, T const &maxVal ) - { - if( val < minVal ) - return minVal; - else if( val > maxVal ) - return maxVal; - else - return val; - } -#endif - #ifndef FALSE #define FALSE 0 #define TRUE (!FALSE)