Merge pull request #22259 from AaronVanGeffen/rework-common

Rework common.h into local definitions
2026-01-27 16:54:52 +01:00 · 2024-07-12 21:27:17 +02:00
parent cee2eb1461 44e09149d9
commit e816e751c9
539 changed files with 859 additions and 856 deletions
--- a/src/openrct2-ui/interface/Dropdown.h
+++ b/src/openrct2-ui/interface/Dropdown.h
@@ -11,7 +11,6 @@

 #include <openrct2-ui/UiStringIds.h>
 #include <openrct2-ui/interface/Window.h>
-#include <openrct2/common.h>
 #include <openrct2/drawing/ImageId.hpp>
 #include <openrct2/util/Util.h>

--- a/src/openrct2-ui/interface/LandTool.h
+++ b/src/openrct2-ui/interface/LandTool.h
@@ -10,7 +10,6 @@
 #pragma once

 #include <openrct2-ui/interface/Window.h>
-#include <openrct2/common.h>
 #include <openrct2/sprites.h>

 constexpr uint16_t kLandToolMinimumSize = 1;
--- a/src/openrct2-ui/interface/Theme.cpp
+++ b/src/openrct2-ui/interface/Theme.cpp
@@ -16,8 +16,8 @@

 #include <memory>
 #include <openrct2/Context.h>
+#include <openrct2/Diagnostic.h>
 #include <openrct2/PlatformEnvironment.h>
-#include <openrct2/common.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/core/File.h>
 #include <openrct2/core/FileScanner.h>
--- a/src/openrct2-ui/interface/Theme.h
+++ b/src/openrct2-ui/interface/Theme.h
@@ -9,7 +9,6 @@

 #pragma once

-#include <openrct2/common.h>
 #include <openrct2/interface/Colour.h>
 #include <openrct2/interface/Window.h>

--- a/src/openrct2-ui/interface/Widget.cpp
+++ b/src/openrct2-ui/interface/Widget.cpp
@@ -12,6 +12,7 @@
 #include <cmath>
 #include <openrct2-ui/UiStringIds.h>
 #include <openrct2/Context.h>
+#include <openrct2/Diagnostic.h>
 #include <openrct2/Game.h>
 #include <openrct2/Input.h>
 #include <openrct2/config/Config.h>