refactor: common definition

Author: ThisAMJ

src/Features/ConfigPlus.cpp

@@ -5,6 +5,7 @@
 #include "Modules/Engine.hpp"
 #include "Modules/FileSystem.hpp"
 #include "Modules/Server.hpp"
+#include "Utils.hpp"
 
 #include <cstdlib>
 #include <cstring>
@@ -15,12 +16,6 @@
 #include <unordered_set>
 #include <fstream>
 
-// Fuck you Windows
-#ifdef _WIN32
-#	define strdup _strdup
-#	define strcasecmp _stricmp
-#endif
-
 #define PERSISTENT_SVAR_FILENAME "svars_persist"
 #define CFG_MESSAGE_TYPE "cfgmessage"
 

src/Features/Hud/Hud.cpp

@@ -21,10 +21,6 @@
 #include <map>
 #include <optional>
 
-#ifdef _WIN32
-#	define strcasecmp _stricmp
-#endif
-
 Variable sar_hud_spacing("sar_hud_spacing", "1", 0, "Spacing between elements of HUD.\n", FCVAR_DONTRECORD);
 Variable sar_hud_x("sar_hud_x", "2", 0, "X padding of HUD.\n", FCVAR_DONTRECORD);
 Variable sar_hud_y("sar_hud_y", "2", 0, "Y padding of HUD.\n", FCVAR_DONTRECORD);

src/Features/Speedrun/Categories.cpp

@@ -16,10 +16,6 @@
 #include <optional>
 #include <variant>
 
-#ifdef _WIN32
-#	define strcasecmp _stricmp
-#endif
-
 Variable sar_speedrun_draw_triggers("sar_speedrun_draw_triggers", "0", "Draw the triggers associated with speedrun rules in the world.\n");
 Variable sar_speedrun_triggers_info("sar_speedrun_triggers_info", "0", "Print player velocity (and position) upon mtrigger activation.\n1 - position and velocity\n2 - only horizontal velocity\n");
 

src/Features/Speedrun/Rules.cpp

@@ -10,12 +10,7 @@
 #include "Modules/Scheme.hpp"
 #include "Modules/Server.hpp"
 #include "Modules/Surface.hpp"
-
-#define TAU 6.28318530718
-
-#ifdef _WIN32
-#	define strcasecmp _stricmp
-#endif
+#include "Utils/Math.hpp"
 
 template <typename V>
 static inline V *lookupMap(std::map<std::string, V> &m, std::string k) {

src/Features/WindowResizer.cpp

@@ -5,9 +5,6 @@
 #include "Utils.hpp"
 #include "Modules/Engine.hpp"
 
-#ifdef _WIN32
-#include <windows.h>
-#endif
 
 Variable sar_allow_resizing_window("sar_allow_resizing_window", "0", 0, 1, "EXPERIMENTAL! Forces resizing on game's window.\n");
 

src/Modules/Engine.cpp

@@ -32,16 +32,6 @@
 #include <cstring>
 #include <cmath>
 
-#ifdef _WIN32
-// clang-format off
-#	include <Windows.h>
-#	include <Memoryapi.h>
-#	define strcasecmp _stricmp
-// clang-format on
-#else
-#	include <sys/mman.h>
-#endif
-
 #define FPS_CHECK_WINDOW 0.5f
 
 Variable host_timescale;

src/Modules/Server.cpp

@@ -49,10 +49,6 @@
 #include <cstring>
 #include <cfloat>
 
-#ifdef _WIN32
-#	define strcasecmp _stricmp
-#endif
-
 #define RESET_COOP_PROGRESS_MESSAGE_TYPE "coop-reset"
 #define CM_FLAGS_MESSAGE_TYPE "cm-flags"
 

src/Utils.cpp

@@ -8,7 +8,6 @@
 
 #ifdef _WIN32
 // clang-format off
-#	include <Windows.h>
 #	include <ImageHlp.h>
 // clang-format on
 #else

src/Utils.hpp

@@ -5,7 +5,11 @@
 #include "Utils/SDK.hpp"
 #include <optional>
 
-#ifndef _WIN32
+#ifdef _WIN32
+#	include <Windows.h>
+#	define strdup _strdup
+#	define strcasecmp _stricmp
+#else
 #	include <unistd.h>
 #endif
 

src/Utils/Math.hpp

@@ -6,6 +6,7 @@
 #define M_PI 3.14159265358979323846
 #define M_PI_F ((float)(M_PI))
 #define M_PI_2 1.57079632679489661923  // pi/2
+#define TAU 6.28318530717958647692
 #define RAD2DEG(x) ((float)(x) * (float)(180.f / M_PI_F))
 #define DEG2RAD(x) ((float)(x) * (float)(M_PI_F / 180.f))