summaryrefslogtreecommitdiffhomepage
path: root/Stars45/NetPlayer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/NetPlayer.cpp')
-rw-r--r--Stars45/NetPlayer.cpp8
1 files changed, 7 insertions, 1 deletions
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 <algorithm>
+
#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;
}