rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)

2 files changed, 4 insertions, 4 deletions

diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index 575c592c..64c9e256 100644
--- a/src/objects/Object.cpp
+++ b/src/objects/Object.cpp
@@ -234,9 +234,9 @@ CObject::Render(void)
 	float green = (0.8f * CTimeCycle::GetDirectionalGreen() + CTimeCycle::GetAmbientGreen_Obj()) * 165.75f;
 	float blue = (0.8f * CTimeCycle::GetDirectionalBlue() + CTimeCycle::GetAmbientBlue_Obj()) * 165.75f;
 
-	red = clamp(red, 0.0f, 255.0f);
-	green = clamp(green, 0.0f, 255.0f);
-	blue = clamp(blue, 0.0f, 255.0f);
+	red = Clamp(red, 0.0f, 255.0f);
+	green = Clamp(green, 0.0f, 255.0f);
+	blue = Clamp(blue, 0.0f, 255.0f);
 
 	int alpha = CGeneral::GetRandomNumberInRange(196, 225);
 
diff --git a/src/objects/Stinger.cpp b/src/objects/Stinger.cpp
index 29efea10..d3eee416 100644
--- a/src/objects/Stinger.cpp
+++ b/src/objects/Stinger.cpp
@@ -220,7 +220,7 @@ CStinger::Process()
 			float degangle = progress * ARRAY_SIZE(m_vPositions);
 			float angle1 = m_fMax_Z + DEGTORAD(degangle);
 			float angle2 = m_fMax_Z - DEGTORAD(degangle);
-			int pos = clamp(degangle, 0, ARRAY_SIZE(m_vPositions)-1);
+			int pos = Clamp(degangle, 0, ARRAY_SIZE(m_vPositions)-1);
 
 			CVector2D pos2d = m_vPositions[pos];
 			CVector pos3d = m_vPos;