From befb8be391543f4fadcc4f49aa48d219368e25a9 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Oct 2021 16:19:10 +0200 Subject: Replaced min max macros with std ones --- Stars45/Drive.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Stars45/Drive.cpp') 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 + #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; } -- cgit v1.1