diff --git a/contributors.md b/contributors.md index e6aba68019..de17452c45 100644 --- a/contributors.md +++ b/contributors.md @@ -94,6 +94,7 @@ The following people are not part of the project team, but have been contributin * Christian Friedrich Coors (ccoors) * Robbin Voortman (rvoortman) * (telk5093) +* Ethan Smith (ethanhs) - Refactoring. ## Toolchain * (Balletie) - macOS diff --git a/src/openrct2/OpenRCT2.h b/src/openrct2/OpenRCT2.h index 86b40e0a45..a00a4e324a 100644 --- a/src/openrct2/OpenRCT2.h +++ b/src/openrct2/OpenRCT2.h @@ -19,11 +19,6 @@ #include "common.h" #include "core/Guard.hpp" -// Defining MAX_PATH temporarily until the paths below can be removed -// Saves us from importing system headers in a header file. -#ifndef MAX_PATH -#define MAX_PATH 260 -#endif #ifndef DISABLE_NETWORK #include diff --git a/src/openrct2/common.h b/src/openrct2/common.h index 2afb32dfa2..aed82f1d56 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -54,6 +54,12 @@ typedef wchar_t utf16; typedef utf16* utf16string; #endif +// Defining MAX_PATH temporarily until the paths below can be removed +// Saves us from importing system headers in a header file. +#ifndef MAX_PATH +#define MAX_PATH 260 +#endif + typedef uint32 codepoint_t; typedef uint8 colour_t; diff --git a/src/openrct2/scenario/ScenarioRepository.h b/src/openrct2/scenario/ScenarioRepository.h index bb790cacee..6f63874825 100644 --- a/src/openrct2/scenario/ScenarioRepository.h +++ b/src/openrct2/scenario/ScenarioRepository.h @@ -18,10 +18,6 @@ #include "../common.h" -#ifndef MAX_PATH - #define MAX_PATH 260 -#endif - struct rct_object_entry; typedef struct scenario_highscore_entry diff --git a/src/openrct2/title/TitleSequence.cpp b/src/openrct2/title/TitleSequence.cpp index d394b31c90..8c318a32c9 100644 --- a/src/openrct2/title/TitleSequence.cpp +++ b/src/openrct2/title/TitleSequence.cpp @@ -31,9 +31,6 @@ #include "../core/Zip.h" #include "TitleSequence.h" -#ifndef MAX_PATH - #define MAX_PATH 260 -#endif static std::vector GetSaves(const utf8 * path); static std::vector GetSaves(IZipArchive * zip);