Merge #5287 #5288

5287: Work around Windows's definition of `min`/`max` r=Jupeyy a=heinrich5991

This allows us to use `std::min`/`std::max`.

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


5288: Remove outdated comment r=Jupeyy a=heinrich5991

The string comparison isn't actually done anymore, it's now done via a
boolean flag.

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: heinrich5991 <heinrich5991@gmail.com>

CMakeLists.txt

@@ -3013,6 +3013,7 @@ foreach(target ${TARGETS_OWN})
     target_compile_options(${target} PRIVATE /wd4800) # Implicit conversion of int to bool.
   endif()
   if(TARGET_OS STREQUAL "windows")
+    target_compile_definitions(${target} PRIVATE NOMINMAX) # windows.h shouldn't define min/max macros
     target_compile_definitions(${target} PRIVATE UNICODE) # Windows headers
     target_compile_definitions(${target} PRIVATE _UNICODE) # C-runtime
   endif()

src/base/math.h

@@ -95,22 +95,22 @@ constexpr float pi = 3.1415926535897932384626433f;
 template<typename T>
 constexpr inline T minimum(T a, T b)
 {
-	return a < b ? a : b;
+	return std::min(a, b);
 }
 template<typename T>
 constexpr inline T minimum(T a, T b, T c)
 {
-	return minimum(minimum(a, b), c);
+	return std::min(std::min(a, b), c);
 }
 template<typename T>
 constexpr inline T maximum(T a, T b)
 {
-	return a > b ? a : b;
+	return std::max(a, b);
 }
 template<typename T>
 constexpr inline T maximum(T a, T b, T c)
 {
-	return maximum(maximum(a, b), c);
+	return std::max(std::max(a, b), c);
 }
 template<typename T>
 constexpr inline T absolute(T a)

src/engine/server/server.cpp

@@ -2678,7 +2678,7 @@ int CServer::Run()
 			int64_t t = time_get();
 			int NewTicks = 0;
 
-			// load new map TODO: don't poll this
+			// load new map
 			if(m_MapReload || m_CurrentGameTick >= 0x6FFFFFFF) // force reload to make sure the ticks stay within a valid range
 			{
 				// load map