From d17d437de319ca4c388dc724cffea91702d3a699 Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Mon, 28 Jun 2021 13:57:05 +0200
Subject: rename clamp macro to Clamp to fix compilation with g++11 (and clamp2
 for consistency sake)

---
 src/vehicles/Automobile.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/vehicles/Automobile.cpp')

diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index 14f2909b..8a50ddcf 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -2261,7 +2261,7 @@ CAutomobile::PreRender(void)
 
 		// 1.0 if directly behind car, -1.0 if in front
 		float behindness = DotProduct(lookVector, GetForward());
-		behindness = clamp(behindness, -1.0f, 1.0f);	// shouldn't be necessary
+		behindness = Clamp(behindness, -1.0f, 1.0f);	// shouldn't be necessary
 		// 0.0 if behind car, PI if in front
 		// Abs not necessary
 		float angle = Abs(Acos(behindness));
@@ -2619,7 +2619,7 @@ CAutomobile::PreRender(void)
 			float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale;
 			if(GetModelIndex() == MI_VOODOO)
 				groundOffset *= 0.6f;
-			mat.RotateY(Asin(clamp(-groundOffset, -1.0f, 1.0f)));
+			mat.RotateY(Asin(Clamp(-groundOffset, -1.0f, 1.0f)));
 		}
 	}
 	if(pHandling->Flags & HANDLING_FAT_REARW)
@@ -2660,7 +2660,7 @@ CAutomobile::PreRender(void)
 			float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale;
 			if(GetModelIndex() == MI_VOODOO)
 				groundOffset *= 0.6f;
-			mat.RotateY(Asin(clamp(groundOffset, -1.0f, 1.0f)));
+			mat.RotateY(Asin(Clamp(groundOffset, -1.0f, 1.0f)));
 		}
 	}
 	if(pHandling->Flags & HANDLING_FAT_REARW)
@@ -2693,7 +2693,7 @@ CAutomobile::PreRender(void)
 				float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale;
 				if(GetModelIndex() == MI_VOODOO)
 					groundOffset *= 0.6f;
-				mat.RotateY(Asin(clamp(-groundOffset, -1.0f, 1.0f)));
+				mat.RotateY(Asin(Clamp(-groundOffset, -1.0f, 1.0f)));
 			}
 		}
 		if(pHandling->Flags & HANDLING_FAT_REARW)
@@ -2727,7 +2727,7 @@ CAutomobile::PreRender(void)
 				float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale;
 				if(GetModelIndex() == MI_VOODOO)
 					groundOffset *= 0.6f;
-				mat.RotateY(Asin(clamp(groundOffset, -1.0f, 1.0f)));
+				mat.RotateY(Asin(Clamp(groundOffset, -1.0f, 1.0f)));
 			}
 		}
 		if(pHandling->Flags & HANDLING_FAT_REARW)
@@ -2861,7 +2861,7 @@ CAutomobile::PreRender(void)
 				float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale;
 				if(GetModelIndex() == MI_VOODOO)
 					groundOffset *= 0.6f;
-				mat.RotateY(Asin(clamp(-groundOffset, -1.0f, 1.0f)));
+				mat.RotateY(Asin(Clamp(-groundOffset, -1.0f, 1.0f)));
 			}
 		}
 		if(pHandling->Flags & HANDLING_NARROW_FRONTW)
@@ -2902,7 +2902,7 @@ CAutomobile::PreRender(void)
 				float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale;
 				if(GetModelIndex() == MI_VOODOO)
 					groundOffset *= 0.6f;
-				mat.RotateY(Asin(clamp(groundOffset, -1.0f, 1.0f)));
+				mat.RotateY(Asin(Clamp(groundOffset, -1.0f, 1.0f)));
 			}
 		}
 		if(pHandling->Flags & HANDLING_NARROW_FRONTW)
@@ -3120,7 +3120,7 @@ CAutomobile::ProcessControlInputs(uint8 pad)
 			0.2f*CTimer::GetTimeStep();
 		nLastControlInput = 0;
 	}
-	m_fSteerInput = clamp(m_fSteerInput, -1.0f, 1.0f);
+	m_fSteerInput = Clamp(m_fSteerInput, -1.0f, 1.0f);
 
 	// Accelerate/Brake
 	float acceleration = (CPad::GetPad(pad)->GetAccelerate() - CPad::GetPad(pad)->GetBrake())/255.0f;
@@ -3239,7 +3239,7 @@ CAutomobile::FireTruckControl(void)
 			m_fCarGunLR += CPad::GetPad(0)->GetCarGunLeftRight() * 0.00025f * CTimer::GetTimeStep();
 			m_fCarGunUD += CPad::GetPad(0)->GetCarGunUpDown() * 0.0001f * CTimer::GetTimeStep();
 		}
-		m_fCarGunUD = clamp(m_fCarGunUD, 0.05f, 0.3f);
+		m_fCarGunUD = Clamp(m_fCarGunUD, 0.05f, 0.3f);
 
 
 		CVector cannonPos(0.0f, 1.5f, 1.9f);
@@ -3664,7 +3664,7 @@ CAutomobile::HydraulicControl(void)
 		float limitDiff = extendedLowerLimit - normalLowerLimit;
 		if(limitDiff != 0.0f && Abs(maxDelta/limitDiff) > 0.01f){
 			float f = (maxDelta + limitDiff)/2.0f/limitDiff;
-			f = clamp(f, 0.0f, 1.0f);
+			f = Clamp(f, 0.0f, 1.0f);
 			DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_HYDRAULIC_3, f);
 			if(f < 0.4f || f > 0.6f)
 				setPrevRatio = true;
-- 
cgit v1.2.3