Use std::min/max instead of macros in Timer

This also applies in a bunch of other places because the Windows macros were undefined and using std::min/max was declared.

Author: MaximDude

Managers/TimerMan.h

@@ -14,13 +14,18 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 // Inclusions of header files
 
+// TODO: Figure out where we can include this without imploding the whole game and keeping QPC working and having no method/macro conflicts.
 #include <allegro.h>
-#include <winalleg.h>	
+#include <winalleg.h>
 
 // Windows.h defines these and they conflict with our methods so we need to undefine them manually.
 #undef GetClassName
 #undef PlaySound
 
+// minwindef.h defines these and they conflict with the std methods so we need to undefine them manually.
+#undef min
+#undef max
+
 //#include "Entity.h"
 #include "Singleton.h"
 #define g_TimerMan TimerMan::Instance()

System/Controller.cpp

@@ -80,14 +80,14 @@ namespace RTE {
 		// See if there's other analog input, only if the mouse isn't active (or the cursor will float if mouse is used!)
 		} else if (GetAnalogCursor().GetLargest() > 0.1 && !IsMouseControlled()) {
 			// See how much to accelerate the joystick input based on how long the stick has been pushed around
-			float acceleration = 0.5 + MIN(m_JoyAccelTimer.GetElapsedRealTimeS(), 0.5) * 6;
+			float acceleration = 0.5 + std::min(m_JoyAccelTimer.GetElapsedRealTimeS(), 0.5) * 6;
 			cursorPos += GetAnalogCursor() * 10 * moveScale * acceleration;
 			altered = true;
 
 		// Digital movement
 		} else {
 			// See how much to accelerate the keyboard input based on how long any key has been pressed
-			float acceleration = 0.25 + MIN(m_KeyAccelTimer.GetElapsedRealTimeS(), 0.75) * 6;
+			float acceleration = 0.25 + std::min(m_KeyAccelTimer.GetElapsedRealTimeS(), 0.75) * 6;
 
 			if (IsState(HOLD_LEFT)) {
 				cursorPos.m_X -= 10 * moveScale * acceleration;

System/StandardIncludes.h

@@ -42,5 +42,7 @@ using std::set;
 using std::vector;
 using std::ios_base;
 using std::make_pair;
+using std::min;
+using std::max;
 
 #endif

System/Timer.h

@@ -161,7 +161,7 @@ namespace RTE {
 		/// 0 means no progress, 1.0 means the timer has reached, or is beyond the limit.
 		/// </summary>
 		/// <returns>A normalized scalar between 0.0 - 1.0 showing the progress toward the limit.</returns>
-		double RealTimeLimitProgress() const { return (m_RealTimeLimit == 0) ? 1.0 : (MIN(1.0, GetElapsedRealTimeMS() / (m_RealTimeLimit / m_TicksPerMS))); }
+		double RealTimeLimitProgress() const { return (m_RealTimeLimit == 0) ? 1.0 : (std::min(1.0, GetElapsedRealTimeMS() / (m_RealTimeLimit / m_TicksPerMS))); }
 
 		/// <summary>
 		/// Returns true or false, depending on whether the elapsed time falls in one of two repeating intervals which divide it.
@@ -274,7 +274,7 @@ namespace RTE {
 		/// 0 means no progress, 1.0 means the timer has reached, or is beyond the limit.
 		/// </summary>
 		/// <returns>A normalized scalar between 0.0 - 1.0 showing the progress toward the limit.</returns>
-		double SimTimeLimitProgress() const { return (m_SimTimeLimit == 0) ? 1.0 : (MIN(1.0, GetElapsedSimTimeMS() / (m_SimTimeLimit / m_TicksPerMS))); }
+		double SimTimeLimitProgress() const { return (m_SimTimeLimit == 0) ? 1.0 : (std::min(1.0, GetElapsedSimTimeMS() / (m_SimTimeLimit / m_TicksPerMS))); }
 
 		/// <summary>
 		/// Returns true or false, depending on whether the elapsed time falls in one of two repeating intervals which divide it.