diff options
| author | Aki <please@ignore.pl> | 2021-10-03 16:51:12 +0200 |
|---|---|---|
| committer | Aki <please@ignore.pl> | 2021-10-03 16:51:12 +0200 |
| commit | 104248aabf40b692231fccd1adf1a2a494f1589a (patch) | |
| tree | 5eee42a18a9688b03b483aff5c2bedffb4fe8a6c /Stars45/NetPlayer.cpp | |
| parent | ddd76aa4e1571c8d5965709db5c3cd47a89c9a38 (diff) | |
| parent | d2f333bf998691760b8970c2784756d0fa81e820 (diff) | |
| download | starshatter-104248aabf40b692231fccd1adf1a2a494f1589a.zip starshatter-104248aabf40b692231fccd1adf1a2a494f1589a.tar.gz starshatter-104248aabf40b692231fccd1adf1a2a494f1589a.tar.bz2 | |
Stars45 can now be built under MSYS2/Mingw32
Diffstat (limited to 'Stars45/NetPlayer.cpp')
| -rw-r--r-- | Stars45/NetPlayer.cpp | 8 |
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; } |