Cleanup undef for min / max. NOMINMAX is already in Global.h

client/CPlayerInterface.h

@@ -19,13 +19,6 @@
 #define sprintf_s snprintf
 #endif
 
-#ifdef max
-#undef max
-#endif
-#ifdef min
-#undef min
-#endif
-
 class CButton;
 class CToggleGroup;
 struct TryMoveHero;

client/Graphics.cpp

@@ -33,12 +33,6 @@
 #include "../lib/mapObjects/CObjectHandler.h"
 
 using namespace CSDL_Ext;
-#ifdef min
-#undef min
-#endif
-#ifdef max
-#undef max
-#endif
 
 Graphics * graphics = nullptr;
 

client/windows/GUIClasses.cpp

@@ -65,9 +65,6 @@ using namespace CSDL_Ext;
 std::list<CFocusable*> CFocusable::focusables;
 CFocusable * CFocusable::inputWithFocus;
 
-#undef min
-#undef max
-
 CRecruitmentWindow::CCreatureCard::CCreatureCard(CRecruitmentWindow *window, const CCreature *crea, int totalAmount):
 	CIntObject(LCLICK | RCLICK),
 	parent(window),

lib/CGameState.cpp

@@ -37,13 +37,6 @@
 #include "serializer/CMemorySerializer.h"
 #include "VCMIDirs.h"
 
-#ifdef min
-#undef min
-#endif
-#ifdef max
-#undef max
-#endif
-
 boost::shared_mutex CGameState::mutex;
 
 template <typename T> class CApplyOnGS;

lib/NetPacksLib.cpp

@@ -28,9 +28,6 @@
 #include "StartInfo.h"
 #include "CPlayerState.h"
 
-#undef min
-#undef max
-
 
 DLL_LINKAGE void SetResources::applyGs(CGameState *gs)
 {

server/CGameHandler.cpp

@@ -49,12 +49,6 @@
 #include <boost/thread/xtime.hpp>
 #endif
 extern std::atomic<bool> serverShuttingDown;
-#ifdef min
-#undef min
-#endif
-#ifdef max
-#undef max
-#endif
 
 #define COMPLAIN_RET_IF(cond, txt) do {if (cond){complain(txt); return;}} while(0)
 #define COMPLAIN_RET_FALSE_IF(cond, txt) do {if (cond){complain(txt); return false;}} while(0)