From 03bdf9c0fe25d3d9e765c13a2d18048088c3a3a0 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Oct 2021 21:18:30 +0200 Subject: Replaced remaining minmax macros with std equivelants --- Stars45/NetPlayer.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Stars45/NetPlayer.cpp') diff --git a/Stars45/NetPlayer.cpp b/Stars45/NetPlayer.cpp index 1a15527..5bcfccc 100644 --- a/Stars45/NetPlayer.cpp +++ b/Stars45/NetPlayer.cpp @@ -36,6 +36,12 @@ Network Player (Director) class */ +#ifndef NOMINMAX +#define NOMINMAX +#endif + +#include + #include "MemDebug.h" #include "NetPlayer.h" #include "NetGame.h" @@ -446,7 +452,7 @@ NetPlayer::ExecFrame(double seconds) if (ship) { // bleed off the location error: if (loc_error.length() > 0 && bleed_time > 0) { - double fragment = min(seconds / BLEED, bleed_time); + double fragment = std::min(seconds / BLEED, bleed_time); ship->MoveTo(ship->Location() + loc_error * fragment); bleed_time -= fragment; } -- cgit v1.1