summaryrefslogtreecommitdiffhomepage
path: root/Stars45/Drive.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/Drive.cpp')
-rw-r--r--Stars45/Drive.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Stars45/Drive.cpp b/Stars45/Drive.cpp
index 8cf6dd0..570721d 100644
--- a/Stars45/Drive.cpp
+++ b/Stars45/Drive.cpp
@@ -36,6 +36,10 @@
Weapon class
*/
+#define NOMINMAX
+
+#include <algorithm>
+
#include "MemDebug.h"
#include "Drive.h"
#include "Power.h"
@@ -355,7 +359,7 @@ Drive::GetRequest(double seconds) const
{
if (!power_on) return 0;
- double t_factor = max(throttle + 0.5 * augmenter_throttle, 0.3);
+ double t_factor = std::max(throttle + 0.5 * augmenter_throttle, 0.3);
return t_factor * power_level * sink_rate * seconds;
}