From 1a7251d46f168d30cf2dbd5240464ae4909573cc Mon Sep 17 00:00:00 2001 From: Ethan O'Brien Date: Thu, 9 Jan 2025 15:19:01 -0600 Subject: [PATCH] Remove dead defines --- src/openrct2-ui/TextComposition.cpp | 4 ---- src/openrct2-ui/windows/About.cpp | 4 ---- src/openrct2-ui/windows/Options.cpp | 4 ++-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/openrct2-ui/TextComposition.cpp b/src/openrct2-ui/TextComposition.cpp index 7b88947e37..1d17e8abf4 100644 --- a/src/openrct2-ui/TextComposition.cpp +++ b/src/openrct2-ui/TextComposition.cpp @@ -19,10 +19,6 @@ #include #include -#ifdef __EMSCRIPTEN__ - #include -#endif - #ifdef __MACOSX__ // macOS uses COMMAND rather than CTRL for many keyboard shortcuts #define KEYBOARD_PRIMARY_MODIFIER KMOD_GUI diff --git a/src/openrct2-ui/windows/About.cpp b/src/openrct2-ui/windows/About.cpp index 7ce1c40a24..51be677fa2 100644 --- a/src/openrct2-ui/windows/About.cpp +++ b/src/openrct2-ui/windows/About.cpp @@ -21,10 +21,6 @@ #include #include -#ifdef __EMSCRIPTEN__ - #include -#endif - namespace OpenRCT2::Ui::Windows { static constexpr int32_t WW = 400; diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index d21ece046d..8ab2fc2198 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -413,8 +413,8 @@ namespace OpenRCT2::Ui::Windows MakeWidget ({289, 160}, { 11, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_CLOSE_X, STR_PATH_TO_RCT1_CLEAR_TIP ), // RCT 1 path clear button MakeWidget ({150, 176}, {150, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_EDIT_ASSET_PACKS_BUTTON, STR_NONE ), // Asset packs #ifdef __EMSCRIPTEN__ - MakeWidget ({150, 192}, {150, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_EXPORT_EMSCRIPTEN, STR_NONE ), // Emscripten data export - MakeWidget ({150, 208}, {150, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_IMPORT_EMSCRIPTEN, STR_NONE ), // Emscripten data import + MakeWidget ({150, 192}, {150, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_EXPORT_EMSCRIPTEN, STR_NONE ), // Emscripten data export + MakeWidget ({150, 208}, {150, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_IMPORT_EMSCRIPTEN, STR_NONE ), // Emscripten data import #endif kWidgetsEnd, };