Merge pull request #22016 from AaronVanGeffen/ui-string-ids

Move UI exclusive string ids to UiStringIds.h

src/openrct2-ui/TextComposition.cpp

@@ -10,6 +10,7 @@
 #include "TextComposition.h"
 
 #include "UiContext.h"
+#include "UiStringIds.h"
 #include "interface/InGameConsole.h"
 
 #include <SDL.h>
@@ -19,6 +20,8 @@
 #include <openrct2/core/String.hpp>
 #include <openrct2/interface/InteractiveConsole.h>
 #include <openrct2/localisation/Language.h>
+
+// TODO: only because of STR_NONE. We can do better.
 #include <openrct2/localisation/StringIds.h>
 
 #ifdef __MACOSX__

src/openrct2-ui/UiContext.Linux.cpp

@@ -11,6 +11,8 @@
 
 #    include "UiContext.h"
 
+#    include "UiStringIds.h"
+
 #    include <SDL.h>
 #    include <algorithm>
 #    include <dlfcn.h>
@@ -19,7 +21,6 @@
 #    include <openrct2/core/String.hpp>
 #    include <openrct2/core/StringBuilder.h>
 #    include <openrct2/localisation/Language.h>
-#    include <openrct2/localisation/StringIds.h>
 #    include <openrct2/platform/Platform.h>
 #    include <openrct2/ui/UiContext.h>
 #    include <sstream>

src/openrct2-ui/UiContext.cpp

@@ -12,6 +12,7 @@
 #include "CursorRepository.h"
 #include "SDLException.h"
 #include "TextComposition.h"
+#include "UiStringIds.h"
 #include "WindowManager.h"
 #include "drawing/engines/DrawingEngineFactory.hpp"
 #include "input/ShortcutManager.h"
@@ -38,7 +39,6 @@
 #include <openrct2/drawing/IDrawingEngine.h>
 #include <openrct2/interface/Chat.h>
 #include <openrct2/interface/InteractiveConsole.h>
-#include <openrct2/localisation/StringIds.h>
 #include <openrct2/platform/Platform.h>
 #include <openrct2/scenes/title/TitleSequencePlayer.h>
 #include <openrct2/scripting/ScriptEngine.h>
@@ -47,6 +47,9 @@
 #include <openrct2/world/Location.hpp>
 #include <vector>
 
+// TODO: only because of STR_NONE. We can do better.
+#include <openrct2/localisation/StringIds.h>
+
 using namespace OpenRCT2;
 using namespace OpenRCT2::Drawing;
 using namespace OpenRCT2::Scripting;