From aad71af8ab6585a8808fe15938bbae469305483c Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 14:29:13 +0200 Subject: [PATCH 01/13] Rework OPENRCT2_MASTER_SERVER_URL into kMasterServerURL --- src/openrct2/common.h | 2 -- src/openrct2/network/NetworkBase.cpp | 2 +- src/openrct2/network/NetworkServerAdvertiser.cpp | 2 +- src/openrct2/network/ServerList.cpp | 2 +- src/openrct2/network/network.h | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/openrct2/common.h b/src/openrct2/common.h index 6e5b60ec17..ef3497802a 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -32,8 +32,6 @@ using colour_t = uint8_t; // Gets the name of a symbol as a C string #define nameof(symbol) #symbol -#define OPENRCT2_MASTER_SERVER_URL "https://servers.openrct2.io" - // Time (represented as number of 100-nanosecond intervals since 0001-01-01T00:00:00Z) using datetime64 = uint64_t; diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 7a09220e6a..bffd695c59 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -930,7 +930,7 @@ std::string NetworkBase::GetMasterServerUrl() { if (Config::Get().network.MasterServerUrl.empty()) { - return OPENRCT2_MASTER_SERVER_URL; + return kMasterServerURL; } return Config::Get().network.MasterServerUrl; diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index 900b80e3d7..c053b887c1 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -344,7 +344,7 @@ private: static std::string GetMasterServerUrl() { - std::string result = OPENRCT2_MASTER_SERVER_URL; + std::string result = kMasterServerURL; if (!Config::Get().network.MasterServerUrl.empty()) { result = Config::Get().network.MasterServerUrl; diff --git a/src/openrct2/network/ServerList.cpp b/src/openrct2/network/ServerList.cpp index e3dd821c0d..6127ae3bf9 100644 --- a/src/openrct2/network/ServerList.cpp +++ b/src/openrct2/network/ServerList.cpp @@ -359,7 +359,7 @@ std::future> ServerList::FetchOnlineServerListAsync auto p = std::make_shared>>(); auto f = p->get_future(); - std::string masterServerUrl = OPENRCT2_MASTER_SERVER_URL; + std::string masterServerUrl = kMasterServerURL; if (!Config::Get().network.MasterServerUrl.empty()) { masterServerUrl = Config::Get().network.MasterServerUrl; diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index d5de1bffec..f7c3cf1627 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -14,10 +14,10 @@ constexpr uint16_t kNetworkDefaultPort = 11753; constexpr uint16_t kNetworkLanBroadcastPort = 11754; constexpr const char* kNetworkLanBroadcastMsg = "openrct2.server.query"; +constexpr const char* kMasterServerURL = "https://servers.openrct2.io"; constexpr uint16_t kMaxServerDescriptionLength = 256; #include "../Game.h" -#include "../common.h" #include "../core/JsonFwd.hpp" #include "../localisation/StringIds.h" #include "NetworkTypes.h" From b87224aabca8db18583bfd5a69cc19826535fe7a Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 14:30:12 +0200 Subject: [PATCH 02/13] Remove M_PI undef; no longer conflicts with SHOP_ITEM_PIZZA --- src/openrct2/common.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/openrct2/common.h b/src/openrct2/common.h index ef3497802a..67b4d2d0ff 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -9,8 +9,6 @@ #pragma once -#undef M_PI - // Ignore isatty warning on WIN32 #ifndef _CRT_NONSTDC_NO_WARNINGS # define _CRT_NONSTDC_NO_WARNINGS From f3834ef2d608383b089c761a24ab05858cb13dce Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 14:51:11 +0200 Subject: [PATCH 03/13] Move colour_t definition to Colour.h --- src/openrct2/common.h | 2 -- src/openrct2/interface/Colour.h | 1 + src/openrct2/paint/tile_element/Paint.Surface.h | 2 +- src/openrct2/ride/RideColour.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/openrct2/common.h b/src/openrct2/common.h index 67b4d2d0ff..147254667e 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -25,8 +25,6 @@ #include #include -using colour_t = uint8_t; - // Gets the name of a symbol as a C string #define nameof(symbol) #symbol diff --git a/src/openrct2/interface/Colour.h b/src/openrct2/interface/Colour.h index 36eae268ed..7c1bd123d4 100644 --- a/src/openrct2/interface/Colour.h +++ b/src/openrct2/interface/Colour.h @@ -14,6 +14,7 @@ #include +using colour_t = uint8_t; using PaletteIndex = uint8_t; /** diff --git a/src/openrct2/paint/tile_element/Paint.Surface.h b/src/openrct2/paint/tile_element/Paint.Surface.h index d174132e9a..06eae8f303 100644 --- a/src/openrct2/paint/tile_element/Paint.Surface.h +++ b/src/openrct2/paint/tile_element/Paint.Surface.h @@ -9,7 +9,7 @@ #pragma once -#include "../../common.h" +#include "../../interface/Colour.h" #include "../../sprites.h" #include "../../world/Location.hpp" diff --git a/src/openrct2/ride/RideColour.h b/src/openrct2/ride/RideColour.h index 4dc6836b39..9fe0d61d25 100644 --- a/src/openrct2/ride/RideColour.h +++ b/src/openrct2/ride/RideColour.h @@ -9,7 +9,7 @@ #pragma once -#include "../common.h" +#include "../interface/Colour.h" #include From 7cc1cd09ead32819aaf93bf5ff43b6ccd3bd1a2e Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 15:05:19 +0200 Subject: [PATCH 04/13] Move StringIdType.h include out of common.h --- src/openrct2-ui/UiStringIds.h | 2 +- src/openrct2/Context.h | 2 +- src/openrct2/actions/ResultWithMessage.h | 2 +- src/openrct2/common.h | 1 - src/openrct2/drawing/NewDrawing.h | 2 +- src/openrct2/drawing/Text.h | 2 +- src/openrct2/entity/Litter.h | 1 + src/openrct2/entity/MoneyEffect.cpp | 1 + src/openrct2/entity/MoneyEffect.h | 1 + src/openrct2/entity/Peep.h | 2 +- src/openrct2/localisation/Currency.h | 2 +- src/openrct2/localisation/Date.h | 2 +- src/openrct2/localisation/Formatter.h | 2 +- src/openrct2/localisation/Language.h | 2 +- src/openrct2/localisation/LanguagePack.h | 2 +- src/openrct2/localisation/Localisation.h | 1 + .../localisation/LocalisationService.h | 2 +- src/openrct2/localisation/StringIds.h | 2 +- src/openrct2/management/NewsItem.h | 2 +- src/openrct2/management/Research.h | 2 +- src/openrct2/network/NetworkAction.h | 2 +- src/openrct2/network/ServerList.h | 2 +- src/openrct2/network/network.h | 19 ++++++++----------- src/openrct2/object/BannerSceneryEntry.h | 1 + src/openrct2/object/EntranceEntry.h | 1 + src/openrct2/object/FootpathEntry.h | 1 + src/openrct2/object/LargeSceneryEntry.h | 1 + src/openrct2/object/PathAdditionEntry.h | 1 + src/openrct2/object/SceneryGroupEntry.h | 1 + src/openrct2/object/SmallSceneryEntry.h | 1 + src/openrct2/object/WallSceneryEntry.h | 1 + src/openrct2/object/WaterEntry.h | 1 + src/openrct2/ride/RideStringIds.h | 2 +- 33 files changed, 39 insertions(+), 30 deletions(-) diff --git a/src/openrct2-ui/UiStringIds.h b/src/openrct2-ui/UiStringIds.h index 62ff44bbcd..c897f85119 100644 --- a/src/openrct2-ui/UiStringIds.h +++ b/src/openrct2-ui/UiStringIds.h @@ -9,7 +9,7 @@ #pragma once -#include +#include namespace OpenRCT2 { diff --git a/src/openrct2/Context.h b/src/openrct2/Context.h index 39335fb622..a4ffc54ebf 100644 --- a/src/openrct2/Context.h +++ b/src/openrct2/Context.h @@ -9,9 +9,9 @@ #pragma once -#include "common.h" #include "core/String.hpp" #include "interface/WindowClasses.h" +#include "localisation/StringIdType.h" #include "world/Location.hpp" #include diff --git a/src/openrct2/actions/ResultWithMessage.h b/src/openrct2/actions/ResultWithMessage.h index 6a66e4980a..e2c23c498c 100644 --- a/src/openrct2/actions/ResultWithMessage.h +++ b/src/openrct2/actions/ResultWithMessage.h @@ -9,7 +9,7 @@ #pragma once -#include "../common.h" +#include "../localisation/StringIdType.h" struct ResultWithMessage { diff --git a/src/openrct2/common.h b/src/openrct2/common.h index 147254667e..4cb69c700e 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -19,7 +19,6 @@ #endif #include "Diagnostic.h" -#include "localisation/StringIdType.h" #include #include diff --git a/src/openrct2/drawing/NewDrawing.h b/src/openrct2/drawing/NewDrawing.h index b926babc32..cd71c7b3bf 100644 --- a/src/openrct2/drawing/NewDrawing.h +++ b/src/openrct2/drawing/NewDrawing.h @@ -9,7 +9,7 @@ #pragma once -#include "../common.h" +#include "../localisation/StringIdType.h" struct DrawPixelInfo; struct GamePalette; diff --git a/src/openrct2/drawing/Text.h b/src/openrct2/drawing/Text.h index 3de584c26c..e0a45b460e 100644 --- a/src/openrct2/drawing/Text.h +++ b/src/openrct2/drawing/Text.h @@ -9,8 +9,8 @@ #pragma once -#include "../common.h" #include "../interface/Colour.h" +#include "../localisation/StringIdType.h" #include "Font.h" struct ScreenCoordsXY; diff --git a/src/openrct2/entity/Litter.h b/src/openrct2/entity/Litter.h index c1ec3c40e0..14ea02594b 100644 --- a/src/openrct2/entity/Litter.h +++ b/src/openrct2/entity/Litter.h @@ -9,6 +9,7 @@ #pragma once +#include "../localisation/StringIdType.h" #include "EntityBase.h" class DataSerialiser; diff --git a/src/openrct2/entity/MoneyEffect.cpp b/src/openrct2/entity/MoneyEffect.cpp index c216b791ab..8f2d60a3ca 100644 --- a/src/openrct2/entity/MoneyEffect.cpp +++ b/src/openrct2/entity/MoneyEffect.cpp @@ -6,6 +6,7 @@ * * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ + #include "MoneyEffect.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/entity/MoneyEffect.h b/src/openrct2/entity/MoneyEffect.h index 6cefb3628a..1888d8f1d9 100644 --- a/src/openrct2/entity/MoneyEffect.h +++ b/src/openrct2/entity/MoneyEffect.h @@ -10,6 +10,7 @@ #pragma once #include "../core/Money.hpp" +#include "../localisation/StringIdType.h" #include "EntityBase.h" class DataSerialiser; diff --git a/src/openrct2/entity/Peep.h b/src/openrct2/entity/Peep.h index 7aaa2ba79d..a188c493aa 100644 --- a/src/openrct2/entity/Peep.h +++ b/src/openrct2/entity/Peep.h @@ -10,8 +10,8 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../entity/EntityBase.h" +#include "../localisation/StringIdType.h" #include "../ride/RideTypes.h" #include "../ride/Station.h" #include "../util/Util.h" diff --git a/src/openrct2/localisation/Currency.h b/src/openrct2/localisation/Currency.h index 2fc85d30c7..d03444c2a2 100644 --- a/src/openrct2/localisation/Currency.h +++ b/src/openrct2/localisation/Currency.h @@ -9,8 +9,8 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" +#include "../localisation/StringIdType.h" #include "../util/Util.h" #include "CurrencyTypes.h" diff --git a/src/openrct2/localisation/Date.h b/src/openrct2/localisation/Date.h index 7088b2795e..25bb613dba 100644 --- a/src/openrct2/localisation/Date.h +++ b/src/openrct2/localisation/Date.h @@ -10,7 +10,7 @@ #pragma once #include "../Date.h" -#include "../common.h" +#include "../localisation/StringIdType.h" extern const StringId DateFormatStringIDs[]; extern const StringId DateFormatStringFormatIds[]; diff --git a/src/openrct2/localisation/Formatter.h b/src/openrct2/localisation/Formatter.h index 075dce1f32..52acd0899a 100644 --- a/src/openrct2/localisation/Formatter.h +++ b/src/openrct2/localisation/Formatter.h @@ -10,10 +10,10 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../core/Guard.hpp" #include "../core/Money.hpp" #include "../core/String.hpp" +#include "StringIdType.h" #include #include diff --git a/src/openrct2/localisation/Language.h b/src/openrct2/localisation/Language.h index d9bbff487a..a407117e79 100644 --- a/src/openrct2/localisation/Language.h +++ b/src/openrct2/localisation/Language.h @@ -9,9 +9,9 @@ #pragma once -#include "../common.h" #include "../drawing/Font.h" #include "../interface/FontFamilies.h" +#include "../localisation/StringIdType.h" #include #include diff --git a/src/openrct2/localisation/LanguagePack.h b/src/openrct2/localisation/LanguagePack.h index a1fd1e8bd2..b852152788 100644 --- a/src/openrct2/localisation/LanguagePack.h +++ b/src/openrct2/localisation/LanguagePack.h @@ -9,8 +9,8 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" +#include "../localisation/StringIdType.h" #include #include diff --git a/src/openrct2/localisation/Localisation.h b/src/openrct2/localisation/Localisation.h index 4b5a553b26..84c22d3232 100644 --- a/src/openrct2/localisation/Localisation.h +++ b/src/openrct2/localisation/Localisation.h @@ -10,6 +10,7 @@ #pragma once #include "../management/Marketing.h" +#include "StringIdType.h" #include diff --git a/src/openrct2/localisation/LocalisationService.h b/src/openrct2/localisation/LocalisationService.h index 3b1da874ca..a2090e42d2 100644 --- a/src/openrct2/localisation/LocalisationService.h +++ b/src/openrct2/localisation/LocalisationService.h @@ -9,7 +9,7 @@ #pragma once -#include "../common.h" +#include "../localisation/StringIdType.h" #include #include diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index 955160a224..984dcaae77 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -9,7 +9,7 @@ #pragma once -#include "../common.h" +#include "../localisation/StringIdType.h" enum : StringId { diff --git a/src/openrct2/management/NewsItem.h b/src/openrct2/management/NewsItem.h index de42debca4..279570b8f0 100644 --- a/src/openrct2/management/NewsItem.h +++ b/src/openrct2/management/NewsItem.h @@ -10,8 +10,8 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../core/String.hpp" +#include "../localisation/StringIdType.h" #include #include diff --git a/src/openrct2/management/Research.h b/src/openrct2/management/Research.h index ceb4c9fe13..88719edcdf 100644 --- a/src/openrct2/management/Research.h +++ b/src/openrct2/management/Research.h @@ -9,7 +9,7 @@ #pragma once -#include "../common.h" +#include "../localisation/StringIdType.h" #include "../object/ObjectLimits.h" #include "../object/ObjectTypes.h" #include "../ride/RideTypes.h" diff --git a/src/openrct2/network/NetworkAction.h b/src/openrct2/network/NetworkAction.h index 15a877fdfa..3fce08e4bc 100644 --- a/src/openrct2/network/NetworkAction.h +++ b/src/openrct2/network/NetworkAction.h @@ -10,7 +10,7 @@ #pragma once #include "../Game.h" -#include "../common.h" +#include "../localisation/StringIdType.h" #include #include diff --git a/src/openrct2/network/ServerList.h b/src/openrct2/network/ServerList.h index 32576c3806..c186e435d5 100644 --- a/src/openrct2/network/ServerList.h +++ b/src/openrct2/network/ServerList.h @@ -9,8 +9,8 @@ #pragma once -#include "../common.h" #include "../core/JsonFwd.hpp" +#include "../localisation/StringIdType.h" #include #include diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index f7c3cf1627..0af8d505ee 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -9,7 +9,14 @@ #pragma once -#include +#include "../Game.h" +#include "../core/JsonFwd.hpp" +#include "../localisation/StringIds.h" +#include "NetworkTypes.h" + +#include +#include +#include constexpr uint16_t kNetworkDefaultPort = 11753; constexpr uint16_t kNetworkLanBroadcastPort = 11754; @@ -17,16 +24,6 @@ constexpr const char* kNetworkLanBroadcastMsg = "openrct2.server.query"; constexpr const char* kMasterServerURL = "https://servers.openrct2.io"; constexpr uint16_t kMaxServerDescriptionLength = 256; -#include "../Game.h" -#include "../core/JsonFwd.hpp" -#include "../localisation/StringIds.h" -#include "NetworkTypes.h" - -#include -#include -#include -#include - class GameAction; struct Peep; struct CoordsXYZ; diff --git a/src/openrct2/object/BannerSceneryEntry.h b/src/openrct2/object/BannerSceneryEntry.h index 6cdfc661fc..61b38ab474 100644 --- a/src/openrct2/object/BannerSceneryEntry.h +++ b/src/openrct2/object/BannerSceneryEntry.h @@ -11,6 +11,7 @@ #include "../common.h" #include "../core/Money.hpp" +#include "../localisation/StringIdType.h" #include "ObjectTypes.h" enum diff --git a/src/openrct2/object/EntranceEntry.h b/src/openrct2/object/EntranceEntry.h index 897cc7ff97..d886cfb000 100644 --- a/src/openrct2/object/EntranceEntry.h +++ b/src/openrct2/object/EntranceEntry.h @@ -10,6 +10,7 @@ #pragma once #include "../common.h" +#include "../localisation/StringIdType.h" #include "ObjectTypes.h" struct EntranceEntry diff --git a/src/openrct2/object/FootpathEntry.h b/src/openrct2/object/FootpathEntry.h index d46b5df93c..f5fbe7b1e5 100644 --- a/src/openrct2/object/FootpathEntry.h +++ b/src/openrct2/object/FootpathEntry.h @@ -10,6 +10,7 @@ #pragma once #include "../common.h" +#include "../localisation/StringIdType.h" #include "ObjectTypes.h" enum class RailingEntrySupportType : uint8_t; diff --git a/src/openrct2/object/LargeSceneryEntry.h b/src/openrct2/object/LargeSceneryEntry.h index 4089b635fe..d20701b335 100644 --- a/src/openrct2/object/LargeSceneryEntry.h +++ b/src/openrct2/object/LargeSceneryEntry.h @@ -11,6 +11,7 @@ #include "../core/Money.hpp" #include "../interface/Cursors.h" +#include "../localisation/StringIdType.h" #include "../world/Location.hpp" #include "ObjectTypes.h" diff --git a/src/openrct2/object/PathAdditionEntry.h b/src/openrct2/object/PathAdditionEntry.h index 174262642a..4f8e95ec3f 100644 --- a/src/openrct2/object/PathAdditionEntry.h +++ b/src/openrct2/object/PathAdditionEntry.h @@ -11,6 +11,7 @@ #include "../core/Money.hpp" #include "../interface/Cursors.h" +#include "../localisation/StringIdType.h" #include "ObjectTypes.h" enum class PathAdditionDrawType : uint8_t diff --git a/src/openrct2/object/SceneryGroupEntry.h b/src/openrct2/object/SceneryGroupEntry.h index e103a499dd..f8d742b34d 100644 --- a/src/openrct2/object/SceneryGroupEntry.h +++ b/src/openrct2/object/SceneryGroupEntry.h @@ -10,6 +10,7 @@ #pragma once #include "../common.h" +#include "../localisation/StringIdType.h" #include "../world/ScenerySelection.h" #include "ObjectTypes.h" diff --git a/src/openrct2/object/SmallSceneryEntry.h b/src/openrct2/object/SmallSceneryEntry.h index af6d71b3ba..07c9c445ff 100644 --- a/src/openrct2/object/SmallSceneryEntry.h +++ b/src/openrct2/object/SmallSceneryEntry.h @@ -11,6 +11,7 @@ #include "../core/Money.hpp" #include "../interface/Cursors.h" +#include "../localisation/StringIdType.h" #include "ObjectTypes.h" enum SMALL_SCENERY_FLAGS : uint32_t diff --git a/src/openrct2/object/WallSceneryEntry.h b/src/openrct2/object/WallSceneryEntry.h index fcc27c00e8..61118628fa 100644 --- a/src/openrct2/object/WallSceneryEntry.h +++ b/src/openrct2/object/WallSceneryEntry.h @@ -11,6 +11,7 @@ #include "../core/Money.hpp" #include "../interface/Cursors.h" +#include "../localisation/StringIdType.h" #include "ObjectTypes.h" enum WALL_SCENERY_FLAGS diff --git a/src/openrct2/object/WaterEntry.h b/src/openrct2/object/WaterEntry.h index 6ab061b344..7c5372b881 100644 --- a/src/openrct2/object/WaterEntry.h +++ b/src/openrct2/object/WaterEntry.h @@ -10,6 +10,7 @@ #pragma once #include "../common.h" +#include "../localisation/StringIdType.h" #include "ObjectTypes.h" enum diff --git a/src/openrct2/ride/RideStringIds.h b/src/openrct2/ride/RideStringIds.h index 9e19970661..dc2a964adf 100644 --- a/src/openrct2/ride/RideStringIds.h +++ b/src/openrct2/ride/RideStringIds.h @@ -9,7 +9,7 @@ #pragma once -#include "../common.h" +#include "../localisation/StringIdType.h" enum : StringId { From db17fc6dadae52e9aaced14f6f0465ea5f7090a4 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 15:17:07 +0200 Subject: [PATCH 05/13] Remove pseudo-keyword 'abstract' --- src/openrct2-ui/UiContext.h | 21 +++-- src/openrct2-ui/audio/AudioContext.h | 6 +- src/openrct2-ui/windows/TileInspector.cpp | 2 +- src/openrct2/Context.h | 83 ++++++++--------- src/openrct2/ParkImporter.h | 13 +-- src/openrct2/PlatformEnvironment.h | 12 +-- src/openrct2/TrackImporter.h | 6 +- src/openrct2/actions/GameAction.h | 4 +- src/openrct2/audio/AudioChannel.h | 58 ++++++------ src/openrct2/audio/AudioContext.h | 28 +++--- src/openrct2/audio/AudioSource.h | 10 +- src/openrct2/common.h | 2 - src/openrct2/config/ConfigEnum.hpp | 4 +- src/openrct2/config/IniReader.hpp | 14 +-- src/openrct2/config/IniWriter.hpp | 14 +-- src/openrct2/core/FileIndex.hpp | 4 +- src/openrct2/core/FileScanner.cpp | 2 +- src/openrct2/core/FileScanner.h | 10 +- src/openrct2/core/IStream.hpp | 20 ++-- src/openrct2/core/StringReader.h | 8 +- src/openrct2/core/Zip.h | 16 ++-- src/openrct2/drawing/IDrawingContext.h | 25 ++--- src/openrct2/drawing/IDrawingEngine.h | 37 ++++---- src/openrct2/interface/InteractiveConsole.h | 8 +- src/openrct2/localisation/LanguagePack.h | 12 +-- .../network/NetworkServerAdvertiser.h | 4 +- src/openrct2/network/Socket.h | 51 +++++----- src/openrct2/object/Object.h | 20 ++-- src/openrct2/object/ObjectFactory.cpp | 4 +- src/openrct2/object/ObjectManager.h | 34 +++---- src/openrct2/object/ObjectRepository.h | 30 +++--- src/openrct2/ride/TrackDesignRepository.h | 14 +-- src/openrct2/scenario/ScenarioRepository.h | 15 ++- .../scenes/title/TitleSequencePlayer.h | 12 +-- src/openrct2/ui/UiContext.h | 93 ++++++++++--------- src/openrct2/ui/WindowManager.h | 33 ++++--- 36 files changed, 366 insertions(+), 363 deletions(-) diff --git a/src/openrct2-ui/UiContext.h b/src/openrct2-ui/UiContext.h index a98ab7a900..9e7bd702f7 100644 --- a/src/openrct2-ui/UiContext.h +++ b/src/openrct2-ui/UiContext.h @@ -31,20 +31,21 @@ namespace OpenRCT2::Ui struct IPlatformUiContext { virtual ~IPlatformUiContext() = default; - virtual void SetWindowIcon(SDL_Window* window) abstract; - virtual bool IsSteamOverlayAttached() abstract; + virtual void SetWindowIcon(SDL_Window* window) = 0; + virtual bool IsSteamOverlayAttached() = 0; - virtual void ShowMessageBox(SDL_Window* window, const std::string& message) abstract; - virtual bool HasMenuSupport() abstract; + virtual void ShowMessageBox(SDL_Window* window, const std::string& message) = 0; + virtual bool HasMenuSupport() = 0; virtual int32_t ShowMenuDialog( - const std::vector& options, const std::string& title, const std::string& text) abstract; - virtual void OpenFolder(const std::string& path) abstract; + const std::vector& options, const std::string& title, const std::string& text) + = 0; + virtual void OpenFolder(const std::string& path) = 0; - virtual void OpenURL(const std::string& url) abstract; - virtual std::string ShowFileDialog(SDL_Window* window, const FileDialogDesc& desc) abstract; - virtual std::string ShowDirectoryDialog(SDL_Window* window, const std::string& title) abstract; + virtual void OpenURL(const std::string& url) = 0; + virtual std::string ShowFileDialog(SDL_Window* window, const FileDialogDesc& desc) = 0; + virtual std::string ShowDirectoryDialog(SDL_Window* window, const std::string& title) = 0; - virtual bool HasFilePicker() const abstract; + virtual bool HasFilePicker() const = 0; }; [[nodiscard]] std::unique_ptr CreateUiContext(const std::shared_ptr& env); diff --git a/src/openrct2-ui/audio/AudioContext.h b/src/openrct2-ui/audio/AudioContext.h index dab4046c10..8cd7e0df7d 100644 --- a/src/openrct2-ui/audio/AudioContext.h +++ b/src/openrct2-ui/audio/AudioContext.h @@ -25,9 +25,9 @@ namespace OpenRCT2::Audio struct ISDLAudioChannel : public IAudioChannel { - [[nodiscard]] virtual AudioFormat GetFormat() const abstract; - [[nodiscard]] virtual SpeexResamplerState* GetResampler() const abstract; - virtual void SetResampler(SpeexResamplerState* value) abstract; + [[nodiscard]] virtual AudioFormat GetFormat() const = 0; + [[nodiscard]] virtual SpeexResamplerState* GetResampler() const = 0; + virtual void SetResampler(SpeexResamplerState* value) = 0; }; namespace AudioChannel diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 3101e7deae..d7f92efb2a 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -2024,7 +2024,7 @@ static uint64_t PageDisabledWidgets[] = { void BannerToggleBlock(int32_t elementIndex, int32_t edgeIndex) { Guard::Assert(edgeIndex >= 0 && edgeIndex < 4, "edgeIndex out of range"); - // Make edgeIndex abstract + // Make edgeIndex = 0 edgeIndex = (edgeIndex - GetCurrentRotation()) & 3; auto modifyTile = TileModifyAction(_toolMap, TileModifyType::BannerToggleBlockingEdge, elementIndex, edgeIndex); GameActions::Execute(&modifyTile); diff --git a/src/openrct2/Context.h b/src/openrct2/Context.h index a4ffc54ebf..bf65c6aa00 100644 --- a/src/openrct2/Context.h +++ b/src/openrct2/Context.h @@ -123,61 +123,60 @@ namespace OpenRCT2 { virtual ~IContext() = default; - [[nodiscard]] virtual std::shared_ptr GetAudioContext() abstract; - [[nodiscard]] virtual std::shared_ptr GetUiContext() abstract; - [[nodiscard]] virtual std::shared_ptr GetPlatformEnvironment() abstract; - virtual Localisation::LocalisationService& GetLocalisationService() abstract; - virtual IObjectManager& GetObjectManager() abstract; - virtual IObjectRepository& GetObjectRepository() abstract; + [[nodiscard]] virtual std::shared_ptr GetAudioContext() = 0; + [[nodiscard]] virtual std::shared_ptr GetUiContext() = 0; + [[nodiscard]] virtual std::shared_ptr GetPlatformEnvironment() = 0; + virtual Localisation::LocalisationService& GetLocalisationService() = 0; + virtual IObjectManager& GetObjectManager() = 0; + virtual IObjectRepository& GetObjectRepository() = 0; #ifdef ENABLE_SCRIPTING - virtual Scripting::ScriptEngine& GetScriptEngine() abstract; + virtual Scripting::ScriptEngine& GetScriptEngine() = 0; #endif - virtual ITrackDesignRepository* GetTrackDesignRepository() abstract; - virtual IScenarioRepository* GetScenarioRepository() abstract; - virtual IReplayManager* GetReplayManager() abstract; - virtual AssetPackManager* GetAssetPackManager() abstract; - virtual IGameStateSnapshots* GetGameStateSnapshots() abstract; - virtual DrawingEngine GetDrawingEngineType() abstract; - virtual Drawing::IDrawingEngine* GetDrawingEngine() abstract; - virtual Paint::Painter* GetPainter() abstract; + virtual ITrackDesignRepository* GetTrackDesignRepository() = 0; + virtual IScenarioRepository* GetScenarioRepository() = 0; + virtual IReplayManager* GetReplayManager() = 0; + virtual AssetPackManager* GetAssetPackManager() = 0; + virtual IGameStateSnapshots* GetGameStateSnapshots() = 0; + virtual DrawingEngine GetDrawingEngineType() = 0; + virtual Drawing::IDrawingEngine* GetDrawingEngine() = 0; + virtual Paint::Painter* GetPainter() = 0; #ifndef DISABLE_NETWORK - virtual NetworkBase& GetNetwork() abstract; + virtual NetworkBase& GetNetwork() = 0; #endif - virtual IScene* GetPreloaderScene() abstract; - virtual IScene* GetIntroScene() abstract; - virtual IScene* GetTitleScene() abstract; - virtual IScene* GetGameScene() abstract; - virtual IScene* GetEditorScene() abstract; + virtual IScene* GetPreloaderScene() = 0; + virtual IScene* GetIntroScene() = 0; + virtual IScene* GetTitleScene() = 0; + virtual IScene* GetGameScene() = 0; + virtual IScene* GetEditorScene() = 0; - virtual IScene* GetActiveScene() abstract; - virtual void SetActiveScene(IScene* screen) abstract; + virtual IScene* GetActiveScene() = 0; + virtual void SetActiveScene(IScene* screen) = 0; - virtual int32_t RunOpenRCT2(int argc, const char** argv) abstract; + virtual int32_t RunOpenRCT2(int argc, const char** argv) = 0; - virtual bool Initialise() abstract; - virtual void InitialiseDrawingEngine() abstract; - virtual void DisposeDrawingEngine() abstract; + virtual bool Initialise() = 0; + virtual void InitialiseDrawingEngine() = 0; + virtual void DisposeDrawingEngine() = 0; - virtual void OpenProgress(StringId captionStringId) abstract; - virtual void SetProgress(uint32_t currentProgress, uint32_t totalCount, StringId format = STR_NONE) abstract; - virtual void CloseProgress() abstract; + virtual void OpenProgress(StringId captionStringId) = 0; + virtual void SetProgress(uint32_t currentProgress, uint32_t totalCount, StringId format = STR_NONE) = 0; + virtual void CloseProgress() = 0; - virtual bool LoadParkFromFile( - const u8string& path, bool loadTitleScreenOnFail = false, bool asScenario = false) abstract; + virtual bool LoadParkFromFile(const u8string& path, bool loadTitleScreenOnFail = false, bool asScenario = false) = 0; virtual bool LoadParkFromStream( - IStream* stream, const std::string& path, bool loadTitleScreenFirstOnFail = false, - bool asScenario = false) abstract; - virtual void WriteLine(const std::string& s) abstract; - virtual void WriteErrorLine(const std::string& s) abstract; - virtual void Finish() abstract; - virtual void Quit() abstract; + IStream* stream, const std::string& path, bool loadTitleScreenFirstOnFail = false, bool asScenario = false) + = 0; + virtual void WriteLine(const std::string& s) = 0; + virtual void WriteErrorLine(const std::string& s) = 0; + virtual void Finish() = 0; + virtual void Quit() = 0; - virtual bool HasNewVersionInfo() const abstract; - virtual const NewVersionInfo* GetNewVersionInfo() const abstract; + virtual bool HasNewVersionInfo() const = 0; + virtual const NewVersionInfo* GetNewVersionInfo() const = 0; - virtual void SetTimeScale(float newScale) abstract; - virtual float GetTimeScale() const abstract; + virtual void SetTimeScale(float newScale) = 0; + virtual float GetTimeScale() const = 0; }; [[nodiscard]] std::unique_ptr CreateContext(); diff --git a/src/openrct2/ParkImporter.h b/src/openrct2/ParkImporter.h index 7fd903872e..436b54ab8c 100644 --- a/src/openrct2/ParkImporter.h +++ b/src/openrct2/ParkImporter.h @@ -51,14 +51,15 @@ struct IParkImporter public: virtual ~IParkImporter() = default; - virtual ParkLoadResult Load(const u8string& path) abstract; - virtual ParkLoadResult LoadSavedGame(const u8string& path, bool skipObjectCheck = false) abstract; - virtual ParkLoadResult LoadScenario(const u8string& path, bool skipObjectCheck = false) abstract; + virtual ParkLoadResult Load(const u8string& path) = 0; + virtual ParkLoadResult LoadSavedGame(const u8string& path, bool skipObjectCheck = false) = 0; + virtual ParkLoadResult LoadScenario(const u8string& path, bool skipObjectCheck = false) = 0; virtual ParkLoadResult LoadFromStream( - OpenRCT2::IStream* stream, bool isScenario, bool skipObjectCheck = false, const u8string& path = {}) abstract; + OpenRCT2::IStream* stream, bool isScenario, bool skipObjectCheck = false, const u8string& path = {}) + = 0; - virtual void Import(OpenRCT2::GameState_t& gameState) abstract; - virtual bool GetDetails(ScenarioIndexEntry* dst) abstract; + virtual void Import(OpenRCT2::GameState_t& gameState) = 0; + virtual bool GetDetails(ScenarioIndexEntry* dst) = 0; }; namespace ParkImporter diff --git a/src/openrct2/PlatformEnvironment.h b/src/openrct2/PlatformEnvironment.h index 926b93e70b..e618943dff 100644 --- a/src/openrct2/PlatformEnvironment.h +++ b/src/openrct2/PlatformEnvironment.h @@ -80,12 +80,12 @@ namespace OpenRCT2 { virtual ~IPlatformEnvironment() = default; - virtual u8string GetDirectoryPath(DIRBASE base) const abstract; - virtual u8string GetDirectoryPath(DIRBASE base, DIRID did) const abstract; - virtual u8string GetFilePath(PATHID pathid) const abstract; - virtual u8string FindFile(DIRBASE base, DIRID did, u8string_view fileName) const abstract; - virtual void SetBasePath(DIRBASE base, u8string_view path) abstract; - virtual bool IsUsingClassic() const abstract; + virtual u8string GetDirectoryPath(DIRBASE base) const = 0; + virtual u8string GetDirectoryPath(DIRBASE base, DIRID did) const = 0; + virtual u8string GetFilePath(PATHID pathid) const = 0; + virtual u8string FindFile(DIRBASE base, DIRID did, u8string_view fileName) const = 0; + virtual void SetBasePath(DIRBASE base, u8string_view path) = 0; + virtual bool IsUsingClassic() const = 0; }; [[nodiscard]] std::unique_ptr CreatePlatformEnvironment(DIRBASE_VALUES basePaths); diff --git a/src/openrct2/TrackImporter.h b/src/openrct2/TrackImporter.h index 32c4f53bac..b5962d8b2f 100644 --- a/src/openrct2/TrackImporter.h +++ b/src/openrct2/TrackImporter.h @@ -25,10 +25,10 @@ struct ITrackImporter public: virtual ~ITrackImporter() = default; - virtual bool Load(const utf8* path) abstract; - virtual bool LoadFromStream(OpenRCT2::IStream* stream) abstract; + virtual bool Load(const utf8* path) = 0; + virtual bool LoadFromStream(OpenRCT2::IStream* stream) = 0; - [[nodiscard]] virtual std::unique_ptr Import() abstract; + [[nodiscard]] virtual std::unique_ptr Import() = 0; }; namespace TrackImporter diff --git a/src/openrct2/actions/GameAction.h b/src/openrct2/actions/GameAction.h index a3b10494c5..23f358fd86 100644 --- a/src/openrct2/actions/GameAction.h +++ b/src/openrct2/actions/GameAction.h @@ -234,12 +234,12 @@ public: /** * Query the result of the game action without changing the game state. */ - virtual GameActions::Result Query() const abstract; + virtual GameActions::Result Query() const = 0; /** * Apply the game action and change the game state. */ - virtual GameActions::Result Execute() const abstract; + virtual GameActions::Result Execute() const = 0; bool LocationValid(const CoordsXY& coords) const; }; diff --git a/src/openrct2/audio/AudioChannel.h b/src/openrct2/audio/AudioChannel.h index 681589fc00..910158e455 100644 --- a/src/openrct2/audio/AudioChannel.h +++ b/src/openrct2/audio/AudioChannel.h @@ -24,46 +24,46 @@ namespace OpenRCT2::Audio { virtual ~IAudioChannel() = default; - virtual IAudioSource* GetSource() const abstract; + virtual IAudioSource* GetSource() const = 0; - virtual MixerGroup GetGroup() const abstract; - virtual void SetGroup(MixerGroup group) abstract; + virtual MixerGroup GetGroup() const = 0; + virtual void SetGroup(MixerGroup group) = 0; - virtual double GetRate() const abstract; - virtual void SetRate(double rate) abstract; + virtual double GetRate() const = 0; + virtual void SetRate(double rate) = 0; - virtual uint64_t GetOffset() const abstract; - virtual bool SetOffset(uint64_t offset) abstract; + virtual uint64_t GetOffset() const = 0; + virtual bool SetOffset(uint64_t offset) = 0; - virtual int32_t GetLoop() const abstract; - virtual void SetLoop(int32_t value) abstract; + virtual int32_t GetLoop() const = 0; + virtual void SetLoop(int32_t value) = 0; - virtual int32_t GetVolume() const abstract; - virtual float GetVolumeL() const abstract; - virtual float GetVolumeR() const abstract; - virtual float GetOldVolumeL() const abstract; - virtual float GetOldVolumeR() const abstract; - virtual int32_t GetOldVolume() const abstract; - virtual void SetVolume(int32_t volume) abstract; + virtual int32_t GetVolume() const = 0; + virtual float GetVolumeL() const = 0; + virtual float GetVolumeR() const = 0; + virtual float GetOldVolumeL() const = 0; + virtual float GetOldVolumeR() const = 0; + virtual int32_t GetOldVolume() const = 0; + virtual void SetVolume(int32_t volume) = 0; - virtual float GetPan() const abstract; - virtual void SetPan(float pan) abstract; + virtual float GetPan() const = 0; + virtual void SetPan(float pan) = 0; - virtual bool IsStopping() const abstract; - virtual void SetStopping(bool value) abstract; + virtual bool IsStopping() const = 0; + virtual void SetStopping(bool value) = 0; - virtual bool IsDone() const abstract; - virtual void SetDone(bool value) abstract; + virtual bool IsDone() const = 0; + virtual void SetDone(bool value) = 0; - virtual bool DeleteOnDone() const abstract; - virtual void SetDeleteOnDone(bool value) abstract; + virtual bool DeleteOnDone() const = 0; + virtual void SetDeleteOnDone(bool value) = 0; - virtual bool IsPlaying() const abstract; + virtual bool IsPlaying() const = 0; - virtual void Play(IAudioSource* source, int32_t loop = 0) abstract; - virtual void Stop() abstract; - virtual void UpdateOldVolume() abstract; + virtual void Play(IAudioSource* source, int32_t loop = 0) = 0; + virtual void Stop() = 0; + virtual void UpdateOldVolume() = 0; - virtual size_t Read(void* dst, size_t len) abstract; + virtual size_t Read(void* dst, size_t len) = 0; }; } // namespace OpenRCT2::Audio diff --git a/src/openrct2/audio/AudioContext.h b/src/openrct2/audio/AudioContext.h index 88deba69e3..b926a0e86f 100644 --- a/src/openrct2/audio/AudioContext.h +++ b/src/openrct2/audio/AudioContext.h @@ -29,25 +29,25 @@ namespace OpenRCT2::Audio { virtual ~IAudioContext() = default; - virtual IAudioMixer* GetMixer() abstract; + virtual IAudioMixer* GetMixer() = 0; - virtual std::vector GetOutputDevices() abstract; - virtual void SetOutputDevice(const std::string& deviceName) abstract; + virtual std::vector GetOutputDevices() = 0; + virtual void SetOutputDevice(const std::string& deviceName) = 0; - virtual IAudioSource* CreateStreamFromCSS(std::unique_ptr stream, uint32_t index) abstract; - virtual IAudioSource* CreateStreamFromWAV(std::unique_ptr stream) abstract; + virtual IAudioSource* CreateStreamFromCSS(std::unique_ptr stream, uint32_t index) = 0; + virtual IAudioSource* CreateStreamFromWAV(std::unique_ptr stream) = 0; - virtual void StartTitleMusic() abstract; + virtual void StartTitleMusic() = 0; - virtual void ToggleAllSounds() abstract; - virtual void PauseSounds() abstract; - virtual void UnpauseSounds() abstract; + virtual void ToggleAllSounds() = 0; + virtual void PauseSounds() = 0; + virtual void UnpauseSounds() = 0; - virtual void StopAll() abstract; - virtual void StopCrowdSound() abstract; - virtual void StopRideMusic() abstract; - virtual void StopTitleMusic() abstract; - virtual void StopVehicleSounds() abstract; + virtual void StopAll() = 0; + virtual void StopCrowdSound() = 0; + virtual void StopRideMusic() = 0; + virtual void StopTitleMusic() = 0; + virtual void StopVehicleSounds() = 0; }; [[nodiscard]] std::unique_ptr CreateDummyAudioContext(); diff --git a/src/openrct2/audio/AudioSource.h b/src/openrct2/audio/AudioSource.h index 382eef1428..8f684726ea 100644 --- a/src/openrct2/audio/AudioSource.h +++ b/src/openrct2/audio/AudioSource.h @@ -21,10 +21,10 @@ namespace OpenRCT2::Audio { virtual ~IAudioSource() = default; - virtual void Release() abstract; - virtual bool IsReleased() const abstract; - virtual int32_t GetBytesPerSecond() const abstract; - virtual uint64_t GetLength() const abstract; - virtual size_t Read(void* dst, uint64_t offset, size_t len) abstract; + virtual void Release() = 0; + virtual bool IsReleased() const = 0; + virtual int32_t GetBytesPerSecond() const = 0; + virtual uint64_t GetLength() const = 0; + virtual size_t Read(void* dst, uint64_t offset, size_t len) = 0; }; } // namespace OpenRCT2::Audio diff --git a/src/openrct2/common.h b/src/openrct2/common.h index 4cb69c700e..b8f3e5a35e 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -32,6 +32,4 @@ using datetime64 = uint64_t; constexpr datetime64 DATETIME64_MIN = 0; -#define abstract = 0 - #define assert_struct_size(x, y) static_assert(sizeof(x) == (y), "Improper struct size") diff --git a/src/openrct2/config/ConfigEnum.hpp b/src/openrct2/config/ConfigEnum.hpp index 8e393a97ef..07cc6478fb 100644 --- a/src/openrct2/config/ConfigEnum.hpp +++ b/src/openrct2/config/ConfigEnum.hpp @@ -30,8 +30,8 @@ template struct ConfigEnumEntry template struct IConfigEnum { virtual ~IConfigEnum() = default; - virtual std::string GetName(T value) const abstract; - virtual T GetValue(const std::string& key, T defaultValue) const abstract; + virtual std::string GetName(T value) const = 0; + virtual T GetValue(const std::string& key, T defaultValue) const = 0; }; template class ConfigEnum final : public IConfigEnum diff --git a/src/openrct2/config/IniReader.hpp b/src/openrct2/config/IniReader.hpp index d4beb1d9e4..c96a51b4a6 100644 --- a/src/openrct2/config/IniReader.hpp +++ b/src/openrct2/config/IniReader.hpp @@ -26,14 +26,14 @@ struct IIniReader { virtual ~IIniReader() = default; - virtual bool ReadSection(const std::string& name) abstract; + virtual bool ReadSection(const std::string& name) = 0; - virtual bool GetBoolean(const std::string& name, bool defaultValue) const abstract; - virtual int32_t GetInt32(const std::string& name, int32_t defaultValue) const abstract; - virtual int64_t GetInt64(const std::string& name, int64_t defaultValue) const abstract; - virtual float GetFloat(const std::string& name, float defaultValue) const abstract; - virtual std::string GetString(const std::string& name, const std::string& defaultValue) const abstract; - virtual bool TryGetString(const std::string& name, std::string* outValue) const abstract; + virtual bool GetBoolean(const std::string& name, bool defaultValue) const = 0; + virtual int32_t GetInt32(const std::string& name, int32_t defaultValue) const = 0; + virtual int64_t GetInt64(const std::string& name, int64_t defaultValue) const = 0; + virtual float GetFloat(const std::string& name, float defaultValue) const = 0; + virtual std::string GetString(const std::string& name, const std::string& defaultValue) const = 0; + virtual bool TryGetString(const std::string& name, std::string* outValue) const = 0; template T GetEnum(const std::string& name, T defaultValue, const IConfigEnum& configEnum) const { diff --git a/src/openrct2/config/IniWriter.hpp b/src/openrct2/config/IniWriter.hpp index bda5e26c9f..c10d4b1d4d 100644 --- a/src/openrct2/config/IniWriter.hpp +++ b/src/openrct2/config/IniWriter.hpp @@ -26,14 +26,14 @@ struct IIniWriter { virtual ~IIniWriter() = default; - virtual void WriteSection(const std::string& name) abstract; + virtual void WriteSection(const std::string& name) = 0; - virtual void WriteBoolean(const std::string& name, bool value) abstract; - virtual void WriteInt32(const std::string& name, int32_t value) abstract; - virtual void WriteInt64(const std::string& name, int64_t value) abstract; - virtual void WriteFloat(const std::string& name, float value) abstract; - virtual void WriteString(const std::string& name, const std::string& value) abstract; - virtual void WriteEnum(const std::string& name, const std::string& key) abstract; + virtual void WriteBoolean(const std::string& name, bool value) = 0; + virtual void WriteInt32(const std::string& name, int32_t value) = 0; + virtual void WriteInt64(const std::string& name, int64_t value) = 0; + virtual void WriteFloat(const std::string& name, float value) = 0; + virtual void WriteString(const std::string& name, const std::string& value) = 0; + virtual void WriteEnum(const std::string& name, const std::string& key) = 0; template void WriteEnum(const std::string& name, T value, const IConfigEnum& configEnum) { diff --git a/src/openrct2/core/FileIndex.hpp b/src/openrct2/core/FileIndex.hpp index 0a9b9b31a3..c8740df75e 100644 --- a/src/openrct2/core/FileIndex.hpp +++ b/src/openrct2/core/FileIndex.hpp @@ -129,12 +129,12 @@ protected: /** * Loads the given file and creates the item representing the data to store in the index. */ - virtual std::optional Create(int32_t language, const std::string& path) const abstract; + virtual std::optional Create(int32_t language, const std::string& path) const = 0; /** * Serialises/DeSerialises an index item to/from the given stream. */ - virtual void Serialise(DataSerialiser& ds, const TItem& item) const abstract; + virtual void Serialise(DataSerialiser& ds, const TItem& item) const = 0; private: ScanResult Scan() const diff --git a/src/openrct2/core/FileScanner.cpp b/src/openrct2/core/FileScanner.cpp index d7977b074c..05af6ca7ab 100644 --- a/src/openrct2/core/FileScanner.cpp +++ b/src/openrct2/core/FileScanner.cpp @@ -149,7 +149,7 @@ public: return false; } - virtual void GetDirectoryChildren(std::vector& children, const std::string& path) abstract; + virtual void GetDirectoryChildren(std::vector& children, const std::string& path) = 0; private: void PushState(const std::string& directory) diff --git a/src/openrct2/core/FileScanner.h b/src/openrct2/core/FileScanner.h index 6b6a03357f..dab468edf9 100644 --- a/src/openrct2/core/FileScanner.h +++ b/src/openrct2/core/FileScanner.h @@ -30,12 +30,12 @@ struct IFileScanner { virtual ~IFileScanner() = default; - virtual const FileScanner::FileInfo& GetFileInfo() const abstract; - virtual const u8string& GetPath() const abstract; - virtual u8string GetPathRelative() const abstract; + virtual const FileScanner::FileInfo& GetFileInfo() const = 0; + virtual const u8string& GetPath() const = 0; + virtual u8string GetPathRelative() const = 0; - virtual void Reset() abstract; - virtual bool Next() abstract; + virtual void Reset() = 0; + virtual bool Next() = 0; }; struct QueryDirectoryResult diff --git a/src/openrct2/core/IStream.hpp b/src/openrct2/core/IStream.hpp index 22c027b7ad..d1163d8356 100644 --- a/src/openrct2/core/IStream.hpp +++ b/src/openrct2/core/IStream.hpp @@ -48,20 +48,20 @@ namespace OpenRCT2 { } - virtual bool CanRead() const abstract; - virtual bool CanWrite() const abstract; + virtual bool CanRead() const = 0; + virtual bool CanWrite() const = 0; - virtual uint64_t GetLength() const abstract; - virtual uint64_t GetPosition() const abstract; - virtual void SetPosition(uint64_t position) abstract; - virtual void Seek(int64_t offset, int32_t origin) abstract; + virtual uint64_t GetLength() const = 0; + virtual uint64_t GetPosition() const = 0; + virtual void SetPosition(uint64_t position) = 0; + virtual void Seek(int64_t offset, int32_t origin) = 0; - virtual void Read(void* buffer, uint64_t length) abstract; - virtual void Write(const void* buffer, uint64_t length) abstract; + virtual void Read(void* buffer, uint64_t length) = 0; + virtual void Write(const void* buffer, uint64_t length) = 0; - virtual uint64_t TryRead(void* buffer, uint64_t length) abstract; + virtual uint64_t TryRead(void* buffer, uint64_t length) = 0; - virtual const void* GetData() const abstract; + virtual const void* GetData() const = 0; /////////////////////////////////////////////////////////////////////////// // Fast path methods, class can override them to use specialised copies. diff --git a/src/openrct2/core/StringReader.h b/src/openrct2/core/StringReader.h index 2b65bb7ce1..08d34ccc8a 100644 --- a/src/openrct2/core/StringReader.h +++ b/src/openrct2/core/StringReader.h @@ -16,10 +16,10 @@ struct IStringReader { virtual ~IStringReader() = default; - virtual bool TryPeek(codepoint_t* outCodepoint) abstract; - virtual bool TryRead(codepoint_t* outCodepoint) abstract; - virtual void Skip() abstract; - virtual bool CanRead() const abstract; + virtual bool TryPeek(codepoint_t* outCodepoint) = 0; + virtual bool TryRead(codepoint_t* outCodepoint) = 0; + virtual void Skip() = 0; + virtual bool CanRead() const = 0; }; class UTF8StringReader final : public IStringReader diff --git a/src/openrct2/core/Zip.h b/src/openrct2/core/Zip.h index 4749c99e76..0010a41b4a 100644 --- a/src/openrct2/core/Zip.h +++ b/src/openrct2/core/Zip.h @@ -31,21 +31,21 @@ struct IZipArchive { } - [[nodiscard]] virtual size_t GetNumFiles() const abstract; - [[nodiscard]] virtual std::string GetFileName(size_t index) const abstract; - [[nodiscard]] virtual uint64_t GetFileSize(size_t index) const abstract; - [[nodiscard]] virtual std::vector GetFileData(std::string_view path) const abstract; - [[nodiscard]] virtual std::unique_ptr GetFileStream(std::string_view path) const abstract; + [[nodiscard]] virtual size_t GetNumFiles() const = 0; + [[nodiscard]] virtual std::string GetFileName(size_t index) const = 0; + [[nodiscard]] virtual uint64_t GetFileSize(size_t index) const = 0; + [[nodiscard]] virtual std::vector GetFileData(std::string_view path) const = 0; + [[nodiscard]] virtual std::unique_ptr GetFileStream(std::string_view path) const = 0; /** * Creates or overwrites a file within the zip archive to the given data buffer. * @param path The path of the file within the zip. * @param data The data to write. */ - virtual void SetFileData(std::string_view path, std::vector&& data) abstract; + virtual void SetFileData(std::string_view path, std::vector&& data) = 0; - virtual void DeleteFile(std::string_view path) abstract; - virtual void RenameFile(std::string_view path, std::string_view newPath) abstract; + virtual void DeleteFile(std::string_view path) = 0; + virtual void RenameFile(std::string_view path, std::string_view newPath) = 0; [[nodiscard]] std::optional GetIndexFromPath(std::string_view path) const; [[nodiscard]] bool Exists(std::string_view path) const; diff --git a/src/openrct2/drawing/IDrawingContext.h b/src/openrct2/drawing/IDrawingContext.h index 6ea2938bac..e918ef2a47 100644 --- a/src/openrct2/drawing/IDrawingContext.h +++ b/src/openrct2/drawing/IDrawingContext.h @@ -21,21 +21,22 @@ namespace OpenRCT2::Drawing { virtual ~IDrawingContext() = default; - virtual void Clear(DrawPixelInfo& dpi, uint8_t paletteIndex) abstract; - virtual void FillRect( - DrawPixelInfo& dpi, uint32_t colour, int32_t left, int32_t top, int32_t right, int32_t bottom) abstract; + virtual void Clear(DrawPixelInfo& dpi, uint8_t paletteIndex) = 0; + virtual void FillRect(DrawPixelInfo& dpi, uint32_t colour, int32_t left, int32_t top, int32_t right, int32_t bottom) + = 0; virtual void FilterRect( - DrawPixelInfo& dpi, FilterPaletteID palette, int32_t left, int32_t top, int32_t right, int32_t bottom) abstract; - virtual void DrawLine(DrawPixelInfo& dpi, uint32_t colour, const ScreenLine& line) abstract; - virtual void DrawSprite(DrawPixelInfo& dpi, const ImageId image, int32_t x, int32_t y) abstract; + DrawPixelInfo& dpi, FilterPaletteID palette, int32_t left, int32_t top, int32_t right, int32_t bottom) + = 0; + virtual void DrawLine(DrawPixelInfo& dpi, uint32_t colour, const ScreenLine& line) = 0; + virtual void DrawSprite(DrawPixelInfo& dpi, const ImageId image, int32_t x, int32_t y) = 0; virtual void DrawSpriteRawMasked( - DrawPixelInfo& dpi, int32_t x, int32_t y, const ImageId maskImage, const ImageId colourImage) abstract; - virtual void DrawSpriteSolid(DrawPixelInfo& dpi, const ImageId image, int32_t x, int32_t y, uint8_t colour) abstract; - virtual void DrawGlyph( - DrawPixelInfo& dpi, const ImageId image, int32_t x, int32_t y, const PaletteMap& palette) abstract; + DrawPixelInfo& dpi, int32_t x, int32_t y, const ImageId maskImage, const ImageId colourImage) + = 0; + virtual void DrawSpriteSolid(DrawPixelInfo& dpi, const ImageId image, int32_t x, int32_t y, uint8_t colour) = 0; + virtual void DrawGlyph(DrawPixelInfo& dpi, const ImageId image, int32_t x, int32_t y, const PaletteMap& palette) = 0; virtual void DrawTTFBitmap( - DrawPixelInfo& dpi, TextDrawInfo* info, TTFSurface* surface, int32_t x, int32_t y, - uint8_t hintingThreshold) abstract; + DrawPixelInfo& dpi, TextDrawInfo* info, TTFSurface* surface, int32_t x, int32_t y, uint8_t hintingThreshold) + = 0; }; } // namespace OpenRCT2::Drawing diff --git a/src/openrct2/drawing/IDrawingEngine.h b/src/openrct2/drawing/IDrawingEngine.h index 157749b08b..2f42735919 100644 --- a/src/openrct2/drawing/IDrawingEngine.h +++ b/src/openrct2/drawing/IDrawingEngine.h @@ -57,26 +57,26 @@ namespace OpenRCT2::Drawing { } - virtual void Initialise() abstract; - virtual void Resize(uint32_t width, uint32_t height) abstract; - virtual void SetPalette(const GamePalette& colours) abstract; + virtual void Initialise() = 0; + virtual void Resize(uint32_t width, uint32_t height) = 0; + virtual void SetPalette(const GamePalette& colours) = 0; - virtual void SetVSync(bool vsync) abstract; + virtual void SetVSync(bool vsync) = 0; - virtual void Invalidate(int32_t left, int32_t top, int32_t right, int32_t bottom) abstract; - virtual void BeginDraw() abstract; - virtual void EndDraw() abstract; - virtual void PaintWindows() abstract; - virtual void PaintWeather() abstract; - virtual void CopyRect(int32_t x, int32_t y, int32_t width, int32_t height, int32_t dx, int32_t dy) abstract; - virtual std::string Screenshot() abstract; + virtual void Invalidate(int32_t left, int32_t top, int32_t right, int32_t bottom) = 0; + virtual void BeginDraw() = 0; + virtual void EndDraw() = 0; + virtual void PaintWindows() = 0; + virtual void PaintWeather() = 0; + virtual void CopyRect(int32_t x, int32_t y, int32_t width, int32_t height, int32_t dx, int32_t dy) = 0; + virtual std::string Screenshot() = 0; - virtual IDrawingContext* GetDrawingContext() abstract; - virtual DrawPixelInfo* GetDrawingPixelInfo() abstract; + virtual IDrawingContext* GetDrawingContext() = 0; + virtual DrawPixelInfo* GetDrawingPixelInfo() = 0; - virtual DRAWING_ENGINE_FLAGS GetFlags() abstract; + virtual DRAWING_ENGINE_FLAGS GetFlags() = 0; - virtual void InvalidateImage(uint32_t image) abstract; + virtual void InvalidateImage(uint32_t image) = 0; }; struct IDrawingEngineFactory @@ -84,8 +84,8 @@ namespace OpenRCT2::Drawing virtual ~IDrawingEngineFactory() { } - [[nodiscard]] virtual std::unique_ptr Create( - DrawingEngine type, const std::shared_ptr& uiContext) abstract; + [[nodiscard]] virtual std::unique_ptr + Create(DrawingEngine type, const std::shared_ptr& uiContext) = 0; }; struct IWeatherDrawer @@ -93,6 +93,7 @@ namespace OpenRCT2::Drawing virtual ~IWeatherDrawer() = default; virtual void Draw( DrawPixelInfo& dpi, int32_t x, int32_t y, int32_t width, int32_t height, int32_t xStart, int32_t yStart, - const uint8_t* weatherpattern) abstract; + const uint8_t* weatherpattern) + = 0; }; } // namespace OpenRCT2::Drawing diff --git a/src/openrct2/interface/InteractiveConsole.h b/src/openrct2/interface/InteractiveConsole.h index ca5b76e7c3..99d38d3996 100644 --- a/src/openrct2/interface/InteractiveConsole.h +++ b/src/openrct2/interface/InteractiveConsole.h @@ -41,8 +41,8 @@ public: void WriteLineWarning(const std::string& s); void WriteFormatLine(const char* format, ...); - virtual void Clear() abstract; - virtual void Close() abstract; - virtual void Hide() abstract; - virtual void WriteLine(const std::string& s, FormatToken colourFormat) abstract; + virtual void Clear() = 0; + virtual void Close() = 0; + virtual void Hide() = 0; + virtual void WriteLine(const std::string& s, FormatToken colourFormat) = 0; }; diff --git a/src/openrct2/localisation/LanguagePack.h b/src/openrct2/localisation/LanguagePack.h index b852152788..192d23e9a2 100644 --- a/src/openrct2/localisation/LanguagePack.h +++ b/src/openrct2/localisation/LanguagePack.h @@ -20,13 +20,13 @@ struct ILanguagePack { virtual ~ILanguagePack() = default; - virtual uint16_t GetId() const abstract; - virtual uint32_t GetCount() const abstract; + virtual uint16_t GetId() const = 0; + virtual uint32_t GetCount() const = 0; - virtual void RemoveString(StringId stringId) abstract; - virtual void SetString(StringId stringId, const std::string& str) abstract; - virtual const utf8* GetString(StringId stringId) const abstract; - virtual StringId GetScenarioOverrideStringId(const utf8* scenarioFilename, uint8_t index) abstract; + virtual void RemoveString(StringId stringId) = 0; + virtual void SetString(StringId stringId, const std::string& str) = 0; + virtual const utf8* GetString(StringId stringId) const = 0; + virtual StringId GetScenarioOverrideStringId(const utf8* scenarioFilename, uint8_t index) = 0; }; namespace LanguagePackFactory diff --git a/src/openrct2/network/NetworkServerAdvertiser.h b/src/openrct2/network/NetworkServerAdvertiser.h index d2d2c6b0f7..8ab80e428c 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.h +++ b/src/openrct2/network/NetworkServerAdvertiser.h @@ -26,8 +26,8 @@ struct INetworkServerAdvertiser { } - virtual ADVERTISE_STATUS GetStatus() const abstract; - virtual void Update() abstract; + virtual ADVERTISE_STATUS GetStatus() const = 0; + virtual void Update() = 0; }; [[nodiscard]] std::unique_ptr CreateServerAdvertiser(uint16_t port); diff --git a/src/openrct2/network/Socket.h b/src/openrct2/network/Socket.h index b9cdbd89c9..29a9b2eedf 100644 --- a/src/openrct2/network/Socket.h +++ b/src/openrct2/network/Socket.h @@ -42,7 +42,7 @@ struct INetworkEndpoint { } - virtual std::string GetHostname() const abstract; + virtual std::string GetHostname() const = 0; }; /** @@ -53,26 +53,26 @@ struct ITcpSocket public: virtual ~ITcpSocket() = default; - virtual SocketStatus GetStatus() const abstract; - virtual const char* GetError() const abstract; - virtual const char* GetHostName() const abstract; - virtual std::string GetIpAddress() const abstract; + virtual SocketStatus GetStatus() const = 0; + virtual const char* GetError() const = 0; + virtual const char* GetHostName() const = 0; + virtual std::string GetIpAddress() const = 0; - virtual void Listen(uint16_t port) abstract; - virtual void Listen(const std::string& address, uint16_t port) abstract; - [[nodiscard]] virtual std::unique_ptr Accept() abstract; + virtual void Listen(uint16_t port) = 0; + virtual void Listen(const std::string& address, uint16_t port) = 0; + [[nodiscard]] virtual std::unique_ptr Accept() = 0; - virtual void Connect(const std::string& address, uint16_t port) abstract; - virtual void ConnectAsync(const std::string& address, uint16_t port) abstract; + virtual void Connect(const std::string& address, uint16_t port) = 0; + virtual void ConnectAsync(const std::string& address, uint16_t port) = 0; - virtual size_t SendData(const void* buffer, size_t size) abstract; - virtual NetworkReadPacket ReceiveData(void* buffer, size_t size, size_t* sizeReceived) abstract; + virtual size_t SendData(const void* buffer, size_t size) = 0; + virtual NetworkReadPacket ReceiveData(void* buffer, size_t size, size_t* sizeReceived) = 0; - virtual void SetNoDelay(bool noDelay) abstract; + virtual void SetNoDelay(bool noDelay) = 0; - virtual void Finish() abstract; - virtual void Disconnect() abstract; - virtual void Close() abstract; + virtual void Finish() = 0; + virtual void Disconnect() = 0; + virtual void Close() = 0; }; /** @@ -83,19 +83,20 @@ struct IUdpSocket public: virtual ~IUdpSocket() = default; - virtual SocketStatus GetStatus() const abstract; - virtual const char* GetError() const abstract; - virtual const char* GetHostName() const abstract; + virtual SocketStatus GetStatus() const = 0; + virtual const char* GetError() const = 0; + virtual const char* GetHostName() const = 0; - virtual void Listen(uint16_t port) abstract; - virtual void Listen(const std::string& address, uint16_t port) abstract; + virtual void Listen(uint16_t port) = 0; + virtual void Listen(const std::string& address, uint16_t port) = 0; - virtual size_t SendData(const std::string& address, uint16_t port, const void* buffer, size_t size) abstract; - virtual size_t SendData(const INetworkEndpoint& destination, const void* buffer, size_t size) abstract; + virtual size_t SendData(const std::string& address, uint16_t port, const void* buffer, size_t size) = 0; + virtual size_t SendData(const INetworkEndpoint& destination, const void* buffer, size_t size) = 0; virtual NetworkReadPacket ReceiveData( - void* buffer, size_t size, size_t* sizeReceived, std::unique_ptr* sender) abstract; + void* buffer, size_t size, size_t* sizeReceived, std::unique_ptr* sender) + = 0; - virtual void Close() abstract; + virtual void Close() = 0; }; [[nodiscard]] std::unique_ptr CreateTcpSocket(); diff --git a/src/openrct2/object/Object.h b/src/openrct2/object/Object.h index f3acf220bc..d4c8cefe76 100644 --- a/src/openrct2/object/Object.h +++ b/src/openrct2/object/Object.h @@ -168,15 +168,15 @@ struct IReadObjectContext { virtual ~IReadObjectContext() = default; - virtual std::string_view GetObjectIdentifier() abstract; - virtual IObjectRepository& GetObjectRepository() abstract; - virtual bool ShouldLoadImages() abstract; - virtual std::vector GetData(std::string_view path) abstract; - virtual ObjectAsset GetAsset(std::string_view path) abstract; + virtual std::string_view GetObjectIdentifier() = 0; + virtual IObjectRepository& GetObjectRepository() = 0; + virtual bool ShouldLoadImages() = 0; + virtual std::vector GetData(std::string_view path) = 0; + virtual ObjectAsset GetAsset(std::string_view path) = 0; - virtual void LogVerbose(ObjectError code, const utf8* text) abstract; - virtual void LogWarning(ObjectError code, const utf8* text) abstract; - virtual void LogError(ObjectError code, const utf8* text) abstract; + virtual void LogVerbose(ObjectError code, const utf8* text) = 0; + virtual void LogWarning(ObjectError code, const utf8* text) = 0; + virtual void LogError(ObjectError code, const utf8* text) = 0; }; #ifdef __WARN_SUGGEST_FINAL_TYPES__ @@ -285,8 +285,8 @@ public: { } virtual void ReadLegacy(IReadObjectContext* context, OpenRCT2::IStream* stream); - virtual void Load() abstract; - virtual void Unload() abstract; + virtual void Load() = 0; + virtual void Unload() = 0; virtual void DrawPreview(DrawPixelInfo& /*dpi*/, int32_t /*width*/, int32_t /*height*/) const { diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp index 2ad3336d19..739cc65d22 100644 --- a/src/openrct2/object/ObjectFactory.cpp +++ b/src/openrct2/object/ObjectFactory.cpp @@ -50,8 +50,8 @@ struct IFileDataRetriever { virtual ~IFileDataRetriever() = default; - virtual std::vector GetData(std::string_view path) const abstract; - virtual ObjectAsset GetAsset(std::string_view path) const abstract; + virtual std::vector GetData(std::string_view path) const = 0; + virtual ObjectAsset GetAsset(std::string_view path) const = 0; }; class FileSystemDataRetriever : public IFileDataRetriever diff --git a/src/openrct2/object/ObjectManager.h b/src/openrct2/object/ObjectManager.h index a463e7e8d3..00dd92d649 100644 --- a/src/openrct2/object/ObjectManager.h +++ b/src/openrct2/object/ObjectManager.h @@ -26,26 +26,26 @@ struct IObjectManager { } - virtual Object* GetLoadedObject(ObjectType objectType, size_t index) abstract; - virtual Object* GetLoadedObject(const ObjectEntryDescriptor& entry) abstract; - virtual ObjectEntryIndex GetLoadedObjectEntryIndex(std::string_view identifier) abstract; - virtual ObjectEntryIndex GetLoadedObjectEntryIndex(const ObjectEntryDescriptor& descriptor) abstract; - virtual ObjectEntryIndex GetLoadedObjectEntryIndex(const Object* object) abstract; - virtual ObjectList GetLoadedObjects() abstract; + virtual Object* GetLoadedObject(ObjectType objectType, size_t index) = 0; + virtual Object* GetLoadedObject(const ObjectEntryDescriptor& entry) = 0; + virtual ObjectEntryIndex GetLoadedObjectEntryIndex(std::string_view identifier) = 0; + virtual ObjectEntryIndex GetLoadedObjectEntryIndex(const ObjectEntryDescriptor& descriptor) = 0; + virtual ObjectEntryIndex GetLoadedObjectEntryIndex(const Object* object) = 0; + virtual ObjectList GetLoadedObjects() = 0; - virtual Object* LoadObject(std::string_view identifier) abstract; - virtual Object* LoadObject(const RCTObjectEntry* entry) abstract; - virtual Object* LoadObject(const ObjectEntryDescriptor& descriptor) abstract; - virtual Object* LoadObject(const ObjectEntryDescriptor& descriptor, ObjectEntryIndex slot) abstract; - virtual void LoadObjects(const ObjectList& entries) abstract; - virtual void UnloadObjects(const std::vector& entries) abstract; - virtual void UnloadAllTransient() abstract; - virtual void UnloadAll() abstract; + virtual Object* LoadObject(std::string_view identifier) = 0; + virtual Object* LoadObject(const RCTObjectEntry* entry) = 0; + virtual Object* LoadObject(const ObjectEntryDescriptor& descriptor) = 0; + virtual Object* LoadObject(const ObjectEntryDescriptor& descriptor, ObjectEntryIndex slot) = 0; + virtual void LoadObjects(const ObjectList& entries) = 0; + virtual void UnloadObjects(const std::vector& entries) = 0; + virtual void UnloadAllTransient() = 0; + virtual void UnloadAll() = 0; - virtual void ResetObjects() abstract; + virtual void ResetObjects() = 0; - virtual std::vector GetPackableObjects() abstract; - virtual const std::vector& GetAllRideEntries(ride_type_t rideType) abstract; + virtual std::vector GetPackableObjects() = 0; + virtual const std::vector& GetAllRideEntries(ride_type_t rideType) = 0; }; [[nodiscard]] std::unique_ptr CreateObjectManager(IObjectRepository& objectRepository); diff --git a/src/openrct2/object/ObjectRepository.h b/src/openrct2/object/ObjectRepository.h index 460f13e921..e02ae6a04a 100644 --- a/src/openrct2/object/ObjectRepository.h +++ b/src/openrct2/object/ObjectRepository.h @@ -81,24 +81,24 @@ struct IObjectRepository { virtual ~IObjectRepository() = default; - virtual void LoadOrConstruct(int32_t language) abstract; - virtual void Construct(int32_t language) abstract; - [[nodiscard]] virtual size_t GetNumObjects() const abstract; - [[nodiscard]] virtual const ObjectRepositoryItem* GetObjects() const abstract; - [[nodiscard]] virtual const ObjectRepositoryItem* FindObjectLegacy(std::string_view legacyIdentifier) const abstract; - [[nodiscard]] virtual const ObjectRepositoryItem* FindObject(std::string_view identifier) const abstract; - [[nodiscard]] virtual const ObjectRepositoryItem* FindObject(const RCTObjectEntry* objectEntry) const abstract; - [[nodiscard]] virtual const ObjectRepositoryItem* FindObject(const ObjectEntryDescriptor& oed) const abstract; + virtual void LoadOrConstruct(int32_t language) = 0; + virtual void Construct(int32_t language) = 0; + [[nodiscard]] virtual size_t GetNumObjects() const = 0; + [[nodiscard]] virtual const ObjectRepositoryItem* GetObjects() const = 0; + [[nodiscard]] virtual const ObjectRepositoryItem* FindObjectLegacy(std::string_view legacyIdentifier) const = 0; + [[nodiscard]] virtual const ObjectRepositoryItem* FindObject(std::string_view identifier) const = 0; + [[nodiscard]] virtual const ObjectRepositoryItem* FindObject(const RCTObjectEntry* objectEntry) const = 0; + [[nodiscard]] virtual const ObjectRepositoryItem* FindObject(const ObjectEntryDescriptor& oed) const = 0; - [[nodiscard]] virtual std::unique_ptr LoadObject(const ObjectRepositoryItem* ori) abstract; - virtual void RegisterLoadedObject(const ObjectRepositoryItem* ori, std::unique_ptr&& object) abstract; - virtual void UnregisterLoadedObject(const ObjectRepositoryItem* ori, Object* object) abstract; + [[nodiscard]] virtual std::unique_ptr LoadObject(const ObjectRepositoryItem* ori) = 0; + virtual void RegisterLoadedObject(const ObjectRepositoryItem* ori, std::unique_ptr&& object) = 0; + virtual void UnregisterLoadedObject(const ObjectRepositoryItem* ori, Object* object) = 0; - virtual void AddObject(const RCTObjectEntry* objectEntry, const void* data, size_t dataSize) abstract; - virtual void AddObjectFromFile( - ObjectGeneration generation, std::string_view objectName, const void* data, size_t dataSize) abstract; + virtual void AddObject(const RCTObjectEntry* objectEntry, const void* data, size_t dataSize) = 0; + virtual void AddObjectFromFile(ObjectGeneration generation, std::string_view objectName, const void* data, size_t dataSize) + = 0; - virtual void ExportPackedObject(OpenRCT2::IStream* stream) abstract; + virtual void ExportPackedObject(OpenRCT2::IStream* stream) = 0; }; [[nodiscard]] std::unique_ptr CreateObjectRepository( diff --git a/src/openrct2/ride/TrackDesignRepository.h b/src/openrct2/ride/TrackDesignRepository.h index 0c276e88dc..318dbbcee7 100644 --- a/src/openrct2/ride/TrackDesignRepository.h +++ b/src/openrct2/ride/TrackDesignRepository.h @@ -32,15 +32,15 @@ struct ITrackDesignRepository { virtual ~ITrackDesignRepository() = default; - [[nodiscard]] virtual size_t GetCount() const abstract; - [[nodiscard]] virtual size_t GetCountForObjectEntry(ride_type_t rideType, const std::string& entry) const abstract; + [[nodiscard]] virtual size_t GetCount() const = 0; + [[nodiscard]] virtual size_t GetCountForObjectEntry(ride_type_t rideType, const std::string& entry) const = 0; [[nodiscard]] virtual std::vector GetItemsForObjectEntry( - ride_type_t rideType, const std::string& entry) const abstract; + ride_type_t rideType, const std::string& entry) const = 0; - virtual void Scan(int32_t language) abstract; - virtual bool Delete(const std::string& path) abstract; - virtual std::string Rename(const std::string& path, const std::string& newName) abstract; - virtual std::string Install(const std::string& path, const std::string& name) abstract; + virtual void Scan(int32_t language) = 0; + virtual bool Delete(const std::string& path) = 0; + virtual std::string Rename(const std::string& path, const std::string& newName) = 0; + virtual std::string Install(const std::string& path, const std::string& name) = 0; }; [[nodiscard]] std::unique_ptr CreateTrackDesignRepository( diff --git a/src/openrct2/scenario/ScenarioRepository.h b/src/openrct2/scenario/ScenarioRepository.h index e9c09c9cda..7107081488 100644 --- a/src/openrct2/scenario/ScenarioRepository.h +++ b/src/openrct2/scenario/ScenarioRepository.h @@ -75,19 +75,18 @@ struct IScenarioRepository /** * Scans the scenario directories and grabs the metadata for all the scenarios. */ - virtual void Scan(int32_t language) abstract; + virtual void Scan(int32_t language) = 0; - virtual size_t GetCount() const abstract; - virtual const ScenarioIndexEntry* GetByIndex(size_t index) const abstract; - virtual const ScenarioIndexEntry* GetByFilename(u8string_view filename) const abstract; + virtual size_t GetCount() const = 0; + virtual const ScenarioIndexEntry* GetByIndex(size_t index) const = 0; + virtual const ScenarioIndexEntry* GetByFilename(u8string_view filename) const = 0; /** * Does not return custom scenarios due to the fact that they may have the same name. */ - virtual const ScenarioIndexEntry* GetByInternalName(const utf8* name) const abstract; - virtual const ScenarioIndexEntry* GetByPath(const utf8* path) const abstract; + virtual const ScenarioIndexEntry* GetByInternalName(const utf8* name) const = 0; + virtual const ScenarioIndexEntry* GetByPath(const utf8* path) const = 0; - virtual bool TryRecordHighscore( - int32_t language, const utf8* scenarioFileName, money64 companyValue, const utf8* name) abstract; + virtual bool TryRecordHighscore(int32_t language, const utf8* scenarioFileName, money64 companyValue, const utf8* name) = 0; }; [[nodiscard]] std::unique_ptr CreateScenarioRepository( diff --git a/src/openrct2/scenes/title/TitleSequencePlayer.h b/src/openrct2/scenes/title/TitleSequencePlayer.h index 3c04f30501..f3058f86e3 100644 --- a/src/openrct2/scenes/title/TitleSequencePlayer.h +++ b/src/openrct2/scenes/title/TitleSequencePlayer.h @@ -15,11 +15,11 @@ struct ITitleSequencePlayer { virtual ~ITitleSequencePlayer() = default; - virtual int32_t GetCurrentPosition() const abstract; + virtual int32_t GetCurrentPosition() const = 0; - virtual bool Begin(size_t titleSequenceId) abstract; - virtual void Reset() abstract; - virtual bool Update() abstract; - virtual void Seek(int32_t position) abstract; - virtual void Eject() abstract; + virtual bool Begin(size_t titleSequenceId) = 0; + virtual void Reset() = 0; + virtual bool Update() = 0; + virtual void Seek(int32_t position) = 0; + virtual void Eject() = 0; }; diff --git a/src/openrct2/ui/UiContext.h b/src/openrct2/ui/UiContext.h index 4c247e2d8c..ba6ab32949 100644 --- a/src/openrct2/ui/UiContext.h +++ b/src/openrct2/ui/UiContext.h @@ -99,72 +99,75 @@ namespace OpenRCT2 { virtual ~IUiContext() = default; - virtual void InitialiseScriptExtensions() abstract; - virtual void Tick() abstract; - virtual void Draw(DrawPixelInfo& dpi) abstract; + virtual void InitialiseScriptExtensions() = 0; + virtual void Tick() = 0; + virtual void Draw(DrawPixelInfo& dpi) = 0; // Window - virtual void CreateWindow() abstract; - virtual void CloseWindow() abstract; - virtual void RecreateWindow() abstract; - virtual void* GetWindow() abstract; - virtual int32_t GetWidth() abstract; - virtual int32_t GetHeight() abstract; - virtual ScaleQuality GetScaleQuality() abstract; - virtual void SetFullscreenMode(FULLSCREEN_MODE mode) abstract; - virtual const std::vector& GetFullscreenResolutions() abstract; - virtual bool HasFocus() abstract; - virtual bool IsMinimised() abstract; - virtual bool IsSteamOverlayActive() abstract; - virtual void ProcessMessages() abstract; - virtual void TriggerResize() abstract; + virtual void CreateWindow() = 0; + virtual void CloseWindow() = 0; + virtual void RecreateWindow() = 0; + virtual void* GetWindow() = 0; + virtual int32_t GetWidth() = 0; + virtual int32_t GetHeight() = 0; + virtual ScaleQuality GetScaleQuality() = 0; + virtual void SetFullscreenMode(FULLSCREEN_MODE mode) = 0; + virtual const std::vector& GetFullscreenResolutions() = 0; + virtual bool HasFocus() = 0; + virtual bool IsMinimised() = 0; + virtual bool IsSteamOverlayActive() = 0; + virtual void ProcessMessages() = 0; + virtual void TriggerResize() = 0; - virtual void ShowMessageBox(const std::string& message) abstract; + virtual void ShowMessageBox(const std::string& message) = 0; virtual int32_t ShowMessageBox( - const std::string& title, const std::string& message, const std::vector& options) abstract; + const std::string& title, const std::string& message, const std::vector& options) + = 0; - virtual bool HasMenuSupport() abstract; + virtual bool HasMenuSupport() = 0; // Creates a menu with a series of options, returns the index of the selected option virtual int32_t ShowMenuDialog( - const std::vector& options, const std::string& title, const std::string& text) abstract; - virtual void OpenFolder(const std::string& path) abstract; - virtual void OpenURL(const std::string& url) abstract; - virtual std::string ShowFileDialog(const FileDialogDesc& desc) abstract; - virtual std::string ShowDirectoryDialog(const std::string& title) abstract; - virtual bool HasFilePicker() const abstract; + const std::vector& options, const std::string& title, const std::string& text) + = 0; + virtual void OpenFolder(const std::string& path) = 0; + virtual void OpenURL(const std::string& url) = 0; + virtual std::string ShowFileDialog(const FileDialogDesc& desc) = 0; + virtual std::string ShowDirectoryDialog(const std::string& title) = 0; + virtual bool HasFilePicker() const = 0; // Input - virtual const CursorState* GetCursorState() abstract; - virtual CursorID GetCursor() abstract; - virtual void SetCursor(CursorID cursor) abstract; - virtual void SetCursorScale(uint8_t scale) abstract; - virtual void SetCursorVisible(bool value) abstract; - virtual ScreenCoordsXY GetCursorPosition() abstract; - virtual void SetCursorPosition(const ScreenCoordsXY& cursorPosition) abstract; - virtual void SetCursorTrap(bool value) abstract; - virtual const uint8_t* GetKeysState() abstract; - virtual const uint8_t* GetKeysPressed() abstract; - virtual void SetKeysPressed(uint32_t keysym, uint8_t scancode) abstract; + virtual const CursorState* GetCursorState() = 0; + virtual CursorID GetCursor() = 0; + virtual void SetCursor(CursorID cursor) = 0; + virtual void SetCursorScale(uint8_t scale) = 0; + virtual void SetCursorVisible(bool value) = 0; + virtual ScreenCoordsXY GetCursorPosition() = 0; + virtual void SetCursorPosition(const ScreenCoordsXY& cursorPosition) = 0; + virtual void SetCursorTrap(bool value) = 0; + virtual const uint8_t* GetKeysState() = 0; + virtual const uint8_t* GetKeysPressed() = 0; + virtual void SetKeysPressed(uint32_t keysym, uint8_t scancode) = 0; // Drawing - [[nodiscard]] virtual std::shared_ptr GetDrawingEngineFactory() abstract; + [[nodiscard]] virtual std::shared_ptr GetDrawingEngineFactory() = 0; virtual void DrawWeatherAnimation( OpenRCT2::Drawing::IWeatherDrawer* weatherDrawer, DrawPixelInfo& dpi, - OpenRCT2::Drawing::DrawWeatherFunc drawFunc) abstract; + OpenRCT2::Drawing::DrawWeatherFunc drawFunc) + = 0; // Text input - virtual bool IsTextInputActive() abstract; - virtual TextInputSession* StartTextInput(u8string& buffer, size_t maxLength) abstract; - virtual void StopTextInput() abstract; + virtual bool IsTextInputActive() = 0; + virtual TextInputSession* StartTextInput(u8string& buffer, size_t maxLength) = 0; + virtual void StopTextInput() = 0; // In-game UI - virtual IWindowManager* GetWindowManager() abstract; + virtual IWindowManager* GetWindowManager() = 0; // Clipboard - virtual bool SetClipboardText(const utf8* target) abstract; + virtual bool SetClipboardText(const utf8* target) = 0; // HACK Until all title logic is moved to libopenrct2ui, we will need to provide some services - virtual ITitleSequencePlayer* GetTitleSequencePlayer() abstract; + virtual ITitleSequencePlayer* GetTitleSequencePlayer() = 0; }; [[nodiscard]] std::shared_ptr CreateDummyUiContext(); diff --git a/src/openrct2/ui/WindowManager.h b/src/openrct2/ui/WindowManager.h index ee29a32067..8138d93b11 100644 --- a/src/openrct2/ui/WindowManager.h +++ b/src/openrct2/ui/WindowManager.h @@ -27,23 +27,22 @@ namespace OpenRCT2::Ui struct IWindowManager { virtual ~IWindowManager() = default; - virtual void Init() abstract; - virtual WindowBase* OpenWindow(WindowClass wc) abstract; - virtual WindowBase* OpenView(uint8_t view) abstract; - virtual WindowBase* OpenDetails(uint8_t type, int32_t id) abstract; - virtual WindowBase* OpenIntent(Intent* intent) abstract; - virtual void BroadcastIntent(const Intent& intent) abstract; - virtual WindowBase* ShowError( - StringId title, StringId message, const Formatter& formatter, bool autoClose = false) abstract; - virtual WindowBase* ShowError(std::string_view title, std::string_view message, bool autoClose = false) abstract; - virtual void ForceClose(WindowClass windowClass) abstract; - virtual void UpdateMapTooltip() abstract; - virtual void HandleInput() abstract; - virtual void HandleKeyboard(bool isTitle) abstract; - virtual std::string GetKeyboardShortcutString(std::string_view shortcutId) abstract; - virtual void SetMainView(const ScreenCoordsXY& viewPos, ZoomLevel zoom, int32_t rotation) abstract; - virtual void UpdateMouseWheel() abstract; - virtual WindowBase* GetOwner(const Viewport* viewport) abstract; + virtual void Init() = 0; + virtual WindowBase* OpenWindow(WindowClass wc) = 0; + virtual WindowBase* OpenView(uint8_t view) = 0; + virtual WindowBase* OpenDetails(uint8_t type, int32_t id) = 0; + virtual WindowBase* OpenIntent(Intent* intent) = 0; + virtual void BroadcastIntent(const Intent& intent) = 0; + virtual WindowBase* ShowError(StringId title, StringId message, const Formatter& formatter, bool autoClose = false) = 0; + virtual WindowBase* ShowError(std::string_view title, std::string_view message, bool autoClose = false) = 0; + virtual void ForceClose(WindowClass windowClass) = 0; + virtual void UpdateMapTooltip() = 0; + virtual void HandleInput() = 0; + virtual void HandleKeyboard(bool isTitle) = 0; + virtual std::string GetKeyboardShortcutString(std::string_view shortcutId) = 0; + virtual void SetMainView(const ScreenCoordsXY& viewPos, ZoomLevel zoom, int32_t rotation) = 0; + virtual void UpdateMouseWheel() = 0; + virtual WindowBase* GetOwner(const Viewport* viewport) = 0; }; std::unique_ptr CreateDummyWindowManager(); From f9dcc21f059e28d67993b365b07031844ba0d345 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 15:23:20 +0200 Subject: [PATCH 06/13] Replace assert_struct_size macro with static_assert --- src/openrct2/GameStateSnapshots.cpp | 2 +- src/openrct2/common.h | 2 - src/openrct2/drawing/Drawing.h | 4 +- src/openrct2/object/Object.h | 2 +- src/openrct2/rct1/RCT1.h | 16 +++---- src/openrct2/rct12/RCT12.h | 70 ++++++++++++++--------------- src/openrct2/rct2/RCT2.h | 28 ++++++------ src/openrct2/ride/Ride.h | 2 +- src/openrct2/ride/RideRatings.h | 2 +- src/openrct2/util/SawyerCoding.h | 2 +- src/openrct2/util/Util.h | 2 +- src/openrct2/world/Map.h | 2 +- src/openrct2/world/TileElement.h | 18 ++++---- 13 files changed, 75 insertions(+), 77 deletions(-) diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 95a758cddd..c801c52edc 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -35,7 +35,7 @@ union EntitySnapshot { } }; -assert_struct_size(EntitySnapshot, 0x200); +static_assert(sizeof(EntitySnapshot) == 0x200); #pragma pack(pop) struct GameStateSnapshot_t diff --git a/src/openrct2/common.h b/src/openrct2/common.h index b8f3e5a35e..ec843f1713 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -31,5 +31,3 @@ using datetime64 = uint64_t; constexpr datetime64 DATETIME64_MIN = 0; - -#define assert_struct_size(x, y) static_assert(sizeof(x) == (y), "Improper struct size") diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index 6737aeeb9c..4c502e57c2 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -94,7 +94,7 @@ struct RCTG1Header uint32_t num_entries = 0; uint32_t total_size = 0; }; -assert_struct_size(RCTG1Header, 8); +static_assert(sizeof(RCTG1Header) == 8); #pragma pack(pop) struct Gx @@ -168,7 +168,7 @@ struct RCTG1Element uint16_t flags; // 0x0C uint16_t zoomed_offset; // 0x0E }; -assert_struct_size(RCTG1Element, 0x10); +static_assert(sizeof(RCTG1Element) == 0x10); enum { diff --git a/src/openrct2/object/Object.h b/src/openrct2/object/Object.h index d4c8cefe76..33121caea8 100644 --- a/src/openrct2/object/Object.h +++ b/src/openrct2/object/Object.h @@ -101,7 +101,7 @@ struct RCTObjectEntry bool operator==(const RCTObjectEntry& rhs) const; bool operator!=(const RCTObjectEntry& rhs) const; }; -assert_struct_size(RCTObjectEntry, 0x10); +static_assert(sizeof(RCTObjectEntry) == 0x10); #pragma pack(pop) diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index 3f1270b3d5..4979de0695 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -231,7 +231,7 @@ namespace RCT1 uint16_t z; uint8_t direction; }; - assert_struct_size(Entrance, 7); + static_assert(sizeof(Entrance) == 7); /** * RCT1 ride structure @@ -387,7 +387,7 @@ namespace RCT1 uint8_t EntranceStyle; // 0x179 uint8_t Unk17A[230]; // 0x17A }; - assert_struct_size(Ride, 0x260); + static_assert(sizeof(Ride) == 0x260); struct UnkEntity : RCT12EntityBase { @@ -684,7 +684,7 @@ namespace RCT1 return ItemStandardFlags; } }; - assert_struct_size(Peep, 0x100); + static_assert(sizeof(Peep) == 0x100); union Entity { @@ -701,7 +701,7 @@ namespace RCT1 RCT12EntityCrashSplash CrashSplash; RCT12EntitySteamParticle SteamParticle; }; - assert_struct_size(Entity, 0x100); + static_assert(sizeof(Entity) == 0x100); struct ResearchItem { @@ -711,7 +711,7 @@ namespace RCT1 uint8_t Flags; uint8_t Category; }; - assert_struct_size(ResearchItem, 5); + static_assert(sizeof(ResearchItem) == 5); /** * RCT1,AA,LL scenario / saved game structure. @@ -888,7 +888,7 @@ namespace RCT1 uint8_t Unk1F8358[432]; uint32_t ExpansionPackChecksum; }; - assert_struct_size(S4, 0x1F850C); + static_assert(sizeof(S4) == 0x1F850C); /** * Track design structure. Only for base RCT1 @@ -936,7 +936,7 @@ namespace RCT1 money16 UpkeepCost; // 0x36 }; - assert_struct_size(TD4, 0x38); + static_assert(sizeof(TD4) == 0x38); /** * Track design structure for Added Attractions / Loopy Landscapes @@ -952,7 +952,7 @@ namespace RCT1 uint8_t Pad45[0x7F]; // 0x45 }; - assert_struct_size(TD4AA, 0xC4); + static_assert(sizeof(TD4AA) == 0xC4); #pragma pack(pop) enum diff --git a/src/openrct2/rct12/RCT12.h b/src/openrct2/rct12/RCT12.h index e6915d9497..9dd96900b5 100644 --- a/src/openrct2/rct12/RCT12.h +++ b/src/openrct2/rct12/RCT12.h @@ -219,7 +219,7 @@ struct RCT12xy8 xy = RCT12_XY8_UNDEFINED; } }; -assert_struct_size(RCT12xy8, 2); +static_assert(sizeof(RCT12xy8) == 2); enum class TD46MazeElementType : uint8_t { @@ -259,7 +259,7 @@ struct TD46MazeElement return Type == EnumValue(TD46MazeElementType::Exit); } }; -assert_struct_size(TD46MazeElement, 0x04); +static_assert(sizeof(TD46MazeElement) == 0x04); /* Track Element entry size: 0x02 */ struct TD46TrackElement @@ -267,14 +267,14 @@ struct TD46TrackElement uint8_t Type; // 0x00 uint8_t Flags; // 0x01 }; -assert_struct_size(TD46TrackElement, 0x02); +static_assert(sizeof(TD46TrackElement) == 0x02); struct RCT12Award { uint16_t Time; uint16_t Type; }; -assert_struct_size(RCT12Award, 4); +static_assert(sizeof(RCT12Award) == 4); /** * A single news item / message. @@ -291,13 +291,13 @@ struct RCT12NewsItem uint8_t Pad0B; char Text[256]; }; -assert_struct_size(RCT12NewsItem, 0x10C); +static_assert(sizeof(RCT12NewsItem) == 0x10C); struct RCT12xyzd8 { uint8_t x, y, z, direction; }; -assert_struct_size(RCT12xyzd8, 4); +static_assert(sizeof(RCT12xyzd8) == 4); struct RCT12PeepSpawn { @@ -306,7 +306,7 @@ struct RCT12PeepSpawn uint8_t z; uint8_t direction; }; -assert_struct_size(RCT12PeepSpawn, 6); +static_assert(sizeof(RCT12PeepSpawn) == 6); enum class RCT12TileElementType : uint8_t { @@ -451,7 +451,7 @@ struct RCT12TileElement : public RCT12TileElementBase return as(); } }; -assert_struct_size(RCT12TileElement, 8); +static_assert(sizeof(RCT12TileElement) == 8); struct RCT12SurfaceElement : RCT12TileElementBase { private: @@ -469,7 +469,7 @@ public: uint8_t GetParkFences() const; bool HasTrackThatNeedsWater() const; }; -assert_struct_size(RCT12SurfaceElement, 8); +static_assert(sizeof(RCT12SurfaceElement) == 8); struct RCT12PathElement : RCT12TileElementBase { private: @@ -504,7 +504,7 @@ public: bool IsBlockedByVehicle() const; }; -assert_struct_size(RCT12PathElement, 8); +static_assert(sizeof(RCT12PathElement) == 8); struct RCT12TrackElement : RCT12TileElementBase { private: @@ -551,7 +551,7 @@ public: bool BlockBrakeClosed() const; bool IsIndestructible() const; }; -assert_struct_size(RCT12TrackElement, 8); +static_assert(sizeof(RCT12TrackElement) == 8); struct RCT12SmallSceneryElement : RCT12TileElementBase { private: @@ -567,7 +567,7 @@ public: colour_t GetSecondaryColour() const; bool NeedsSupports() const; }; -assert_struct_size(RCT12SmallSceneryElement, 8); +static_assert(sizeof(RCT12SmallSceneryElement) == 8); struct RCT12LargeSceneryElement : RCT12TileElementBase { private: @@ -580,7 +580,7 @@ public: colour_t GetSecondaryColour() const; uint8_t GetBannerIndex() const; }; -assert_struct_size(RCT12LargeSceneryElement, 8); +static_assert(sizeof(RCT12LargeSceneryElement) == 8); struct RCT12WallElement : RCT12TileElementBase { private: @@ -606,7 +606,7 @@ public: colour_t GetRCT1WallColour() const; uint8_t GetRCT1Slope() const; }; -assert_struct_size(RCT12WallElement, 8); +static_assert(sizeof(RCT12WallElement) == 8); struct RCT12EntranceElement : RCT12TileElementBase { private: @@ -621,7 +621,7 @@ public: uint8_t GetSequenceIndex() const; uint8_t GetPathType() const; }; -assert_struct_size(RCT12EntranceElement, 8); +static_assert(sizeof(RCT12EntranceElement) == 8); struct RCT12BannerElement : RCT12TileElementBase { private: @@ -637,25 +637,25 @@ public: uint8_t GetPosition() const; uint8_t GetAllowedEdges() const; }; -assert_struct_size(RCT12BannerElement, 8); +static_assert(sizeof(RCT12BannerElement) == 8); struct RCT12CorruptElement : RCT12TileElementBase { uint8_t Pad[4]; }; -assert_struct_size(RCT12CorruptElement, 8); +static_assert(sizeof(RCT12CorruptElement) == 8); struct RCT12EightCarsCorruptElement14 : RCT12TileElementBase { uint8_t Pad[4]; }; -assert_struct_size(RCT12EightCarsCorruptElement14, 8); +static_assert(sizeof(RCT12EightCarsCorruptElement14) == 8); struct RCT12EightCarsCorruptElement15 : RCT12TileElementBase { uint8_t Pad[4]; }; -assert_struct_size(RCT12EightCarsCorruptElement15, 8); +static_assert(sizeof(RCT12EightCarsCorruptElement15) == 8); // Offset into EntityListHead and EntityListCount enum class RCT12EntityLinkListOffset : uint8_t @@ -721,7 +721,7 @@ struct RCT12EntityBase int16_t SpriteBottom; // 0x1C uint8_t EntityDirection; // 0x1E }; -assert_struct_size(RCT12EntityBase, 0x1F); +static_assert(sizeof(RCT12EntityBase) == 0x1F); struct RCT12EntityBalloon : RCT12EntityBase { @@ -732,7 +732,7 @@ struct RCT12EntityBalloon : RCT12EntityBase uint8_t Pad28[4]; uint8_t Colour; // 0x2C }; -assert_struct_size(RCT12EntityBalloon, 0x2D); +static_assert(sizeof(RCT12EntityBalloon) == 0x2D); struct RCT12EntityDuck : RCT12EntityBase { @@ -744,21 +744,21 @@ struct RCT12EntityDuck : RCT12EntityBase uint8_t Pad34[0x14]; uint8_t State; // 0x48 }; -assert_struct_size(RCT12EntityDuck, 0x49); +static_assert(sizeof(RCT12EntityDuck) == 0x49); struct RCT12EntityLitter : RCT12EntityBase { uint8_t Pad1F[0x24 - 0x1F]; uint32_t CreationTick; // 0x24 }; -assert_struct_size(RCT12EntityLitter, 0x28); +static_assert(sizeof(RCT12EntityLitter) == 0x28); struct RCT12EntityParticle : RCT12EntityBase { uint8_t Pad1F[0x26 - 0x1F]; uint16_t Frame; // 0x26 }; -assert_struct_size(RCT12EntityParticle, 0x28); +static_assert(sizeof(RCT12EntityParticle) == 0x28); struct RCT12EntityJumpingFountain : RCT12EntityBase { @@ -772,7 +772,7 @@ struct RCT12EntityJumpingFountain : RCT12EntityBase uint8_t Pad34[0x46 - 0x34]; uint16_t Iteration; // 0x46 }; -assert_struct_size(RCT12EntityJumpingFountain, 0x48); +static_assert(sizeof(RCT12EntityJumpingFountain) == 0x48); struct RCT12EntityMoneyEffect : RCT12EntityBase { @@ -785,7 +785,7 @@ struct RCT12EntityMoneyEffect : RCT12EntityBase int16_t OffsetX; // 0x44 uint16_t Wiggle; // 0x46 }; -assert_struct_size(RCT12EntityMoneyEffect, 0x48); +static_assert(sizeof(RCT12EntityMoneyEffect) == 0x48); struct RCT12EntityCrashedVehicleParticle : RCT12EntityBase { @@ -803,14 +803,14 @@ struct RCT12EntityCrashedVehicleParticle : RCT12EntityBase int32_t AccelerationY; // 0x3C int32_t AccelerationZ; // 0x40 }; -assert_struct_size(RCT12EntityCrashedVehicleParticle, 0x44); +static_assert(sizeof(RCT12EntityCrashedVehicleParticle) == 0x44); struct RCT12EntityCrashSplash : RCT12EntityBase { uint8_t Pad1F[0x26 - 0x1F]; uint16_t Frame; // 0x26 }; -assert_struct_size(RCT12EntityCrashSplash, 0x28); +static_assert(sizeof(RCT12EntityCrashSplash) == 0x28); struct RCT12EntitySteamParticle : RCT12EntityBase { @@ -818,7 +818,7 @@ struct RCT12EntitySteamParticle : RCT12EntityBase uint16_t TimeToMove; // 0x24 uint16_t Frame; // 0x26 }; -assert_struct_size(RCT12EntitySteamParticle, 0x28); +static_assert(sizeof(RCT12EntitySteamParticle) == 0x28); struct RCT12PeepThought { @@ -827,7 +827,7 @@ struct RCT12PeepThought uint8_t Freshness; uint8_t FreshTimeout; }; -assert_struct_size(RCT12PeepThought, 4); +static_assert(sizeof(RCT12PeepThought) == 4); struct RCT12RideMeasurement { @@ -843,7 +843,7 @@ struct RCT12RideMeasurement uint8_t Velocity[RCT12::Limits::RideMeasurementMaxItems]; // 0x258C uint8_t Altitude[RCT12::Limits::RideMeasurementMaxItems]; // 0x384C }; -assert_struct_size(RCT12RideMeasurement, 0x4B0C); +static_assert(sizeof(RCT12RideMeasurement) == 0x4B0C); struct RCT12Banner { @@ -859,7 +859,7 @@ struct RCT12Banner uint8_t x; // 0x06 uint8_t y; // 0x07 }; -assert_struct_size(RCT12Banner, 8); +static_assert(sizeof(RCT12Banner) == 8); struct RCT12MapAnimation { @@ -868,7 +868,7 @@ struct RCT12MapAnimation uint16_t x; uint16_t y; }; -assert_struct_size(RCT12MapAnimation, 6); +static_assert(sizeof(RCT12MapAnimation) == 6); struct RCT12ResearchItem { @@ -892,14 +892,14 @@ struct RCT12ResearchItem ResearchItem ToResearchItem() const; }; -assert_struct_size(RCT12ResearchItem, 5); +static_assert(sizeof(RCT12ResearchItem) == 5); struct RCT12VehicleColour { uint8_t BodyColour; uint8_t TrimColour; }; -assert_struct_size(RCT12VehicleColour, 2); +static_assert(sizeof(RCT12VehicleColour) == 2); #pragma pack(pop) diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h index 14e7eb1323..0c1a0c7bcc 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/rct2/RCT2.h @@ -283,7 +283,7 @@ namespace RCT2 void SetMinCarsPerTrain(uint8_t newValue); void SetMaxCarsPerTrain(uint8_t newValue); }; - assert_struct_size(Ride, 0x260); + static_assert(sizeof(Ride) == 0x260); /* Track Entrance entry size: 0x06 */ struct TD6EntranceElement @@ -303,7 +303,7 @@ namespace RCT2 return !!(direction >> 7); } }; - assert_struct_size(TD6EntranceElement, 0x06); + static_assert(sizeof(TD6EntranceElement) == 0x06); /* Track Scenery entry size: 0x16 */ struct TD6SceneryElement @@ -319,7 +319,7 @@ namespace RCT2 colour_t getTertiaryWallColour() const; void setTertiaryWallColour(colour_t colour); }; - assert_struct_size(TD6SceneryElement, 0x16); + static_assert(sizeof(TD6SceneryElement) == 0x16); /** * Track design structure. @@ -370,7 +370,7 @@ namespace RCT2 uint8_t LiftHillSpeedNumCircuits; // 0xA2 0bCCCL_LLLL // 0xA3 (data starts here in file) }; - assert_struct_size(TD6Track, 0xA3); + static_assert(sizeof(TD6Track) == 0xA3); /** * scores.dat file header. @@ -383,7 +383,7 @@ namespace RCT2 uint32_t Var8; uint32_t ScenarioCount; }; - assert_struct_size(ScoresHeader, 0x10); + static_assert(sizeof(ScoresHeader) == 0x10); /** * An entry of scores.dat @@ -404,7 +404,7 @@ namespace RCT2 money32 CompanyValue; char CompletedBy[64]; }; - assert_struct_size(ScoresEntry, 0x02B0); + static_assert(sizeof(ScoresEntry) == 0x02B0); struct Vehicle : RCT12EntityBase { @@ -529,7 +529,7 @@ namespace RCT2 TrackTypeAndDirection |= trackDirection & RCT12VehicleTrackDirectionMask; } }; - assert_struct_size(Vehicle, 0xDA); + static_assert(sizeof(Vehicle) == 0xDA); struct Peep : RCT12EntityBase { @@ -690,7 +690,7 @@ namespace RCT2 return ItemStandardFlags | (static_cast(ItemExtraFlags) << 32); } }; - assert_struct_size(Peep, 0x100); + static_assert(sizeof(Peep) == 0x100); enum class StaffMode : uint8_t { @@ -718,7 +718,7 @@ namespace RCT2 RCT12EntitySteamParticle SteamParticle; RCT12EntityParticle MiscParticle; }; - assert_struct_size(Entity, 0x100); + static_assert(sizeof(Entity) == 0x100); struct RideRatingCalculationData { @@ -738,7 +738,7 @@ namespace RCT2 uint16_t NumReversers; uint16_t StationFlags; }; - assert_struct_size(RideRatingCalculationData, 76); + static_assert(sizeof(RideRatingCalculationData) == 76); /** * SV6/SC6 header chunk @@ -753,7 +753,7 @@ namespace RCT2 uint32_t MagicNumber; // 0x08 uint8_t Pad0C[0x14]; }; - assert_struct_size(S6Header, 0x20); + static_assert(sizeof(S6Header) == 0x20); /** * SC6 information chunk @@ -772,7 +772,7 @@ namespace RCT2 char Details[256]; // 0x88 RCTObjectEntry Entry; // 0x188 }; - assert_struct_size(S6Info, 0x198); + static_assert(sizeof(S6Info) == 0x198); struct S6Data { @@ -1002,7 +1002,7 @@ namespace RCT2 uint16_t WidePathTileLoopY; uint8_t Pad13CE778[434]; }; - assert_struct_size(S6Data, 0x5a3c4a); + static_assert(sizeof(S6Data) == 0x5a3c4a); struct StexEntry { @@ -1011,7 +1011,7 @@ namespace RCT2 StringId Details; // 0x04 uint8_t Var06; }; - assert_struct_size(StexEntry, 7); + static_assert(sizeof(StexEntry) == 7); #pragma pack(pop) ObjectEntryIndex RCT2RideTypeToOpenRCT2RideType(uint8_t rct2RideType, const RideObjectEntry& rideEntry); diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 3eb68bb270..fed69a499d 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -437,7 +437,7 @@ struct TrackBeginEnd TileElement* end_element; }; #ifdef PLATFORM_32BIT -assert_struct_size(TrackBeginEnd, 36); +static_assert(sizeof(TrackBeginEnd) == 36); #endif #pragma pack(pop) diff --git a/src/openrct2/ride/RideRatings.h b/src/openrct2/ride/RideRatings.h index d7894a44aa..0c50bc65bd 100644 --- a/src/openrct2/ride/RideRatings.h +++ b/src/openrct2/ride/RideRatings.h @@ -34,7 +34,7 @@ struct RatingTuple bool isNull() const; void setNull(); }; -assert_struct_size(RatingTuple, 6); +static_assert(sizeof(RatingTuple) == 6); #pragma pack(pop) diff --git a/src/openrct2/util/SawyerCoding.h b/src/openrct2/util/SawyerCoding.h index 92be12da61..adc6714b65 100644 --- a/src/openrct2/util/SawyerCoding.h +++ b/src/openrct2/util/SawyerCoding.h @@ -17,7 +17,7 @@ struct SawyerCodingChunkHeader uint8_t encoding; uint32_t length; }; -assert_struct_size(SawyerCodingChunkHeader, 5); +static_assert(sizeof(SawyerCodingChunkHeader) == 5); #pragma pack(pop) enum diff --git a/src/openrct2/util/Util.h b/src/openrct2/util/Util.h index 1e664f1fcc..d18181625a 100644 --- a/src/openrct2/util/Util.h +++ b/src/openrct2/util/Util.h @@ -41,7 +41,7 @@ template constexpr T AddClamp(T value, T valueToAdd) { if (std::is_same_v) { - assert_struct_size(money64, sizeof(int64_t)); + static_assert(sizeof(money64) == sizeof(int64_t)); } auto maxCap = std::numeric_limits::max(); auto minCap = std::numeric_limits::lowest(); diff --git a/src/openrct2/world/Map.h b/src/openrct2/world/Map.h index f1bc156f22..9a684bfdbc 100644 --- a/src/openrct2/world/Map.h +++ b/src/openrct2/world/Map.h @@ -190,7 +190,7 @@ struct TileElementIterator TileElement* element; }; #ifdef PLATFORM_32BIT -assert_struct_size(TileElementIterator, 12); +static_assert(sizeof(TileElementIterator) == 12); #endif void TileElementIteratorBegin(TileElementIterator* it); diff --git a/src/openrct2/world/TileElement.h b/src/openrct2/world/TileElement.h index e90a7843f2..183253eac7 100644 --- a/src/openrct2/world/TileElement.h +++ b/src/openrct2/world/TileElement.h @@ -184,7 +184,7 @@ struct TileElement : public TileElementBase void RemoveBannerEntry(); BannerIndex GetBannerIndex() const; }; -assert_struct_size(TileElement, 16); +static_assert(sizeof(TileElement) == 16); struct SurfaceElement : TileElementBase { @@ -232,7 +232,7 @@ public: bool HasTrackThatNeedsWater() const; void SetHasTrackThatNeedsWater(bool on); }; -assert_struct_size(SurfaceElement, 16); +static_assert(sizeof(SurfaceElement) == 16); struct PathElement : TileElementBase { @@ -326,7 +326,7 @@ public: bool IsLevelCrossing(const CoordsXY& coords) const; }; -assert_struct_size(PathElement, 16); +static_assert(sizeof(PathElement) == 16); struct TrackElement : TileElementBase { @@ -427,7 +427,7 @@ public: bool IsStation() const; bool IsBlockStart() const; }; -assert_struct_size(TrackElement, 16); +static_assert(sizeof(TrackElement) == 16); struct SmallSceneryElement : TileElementBase { @@ -462,7 +462,7 @@ public: void SetNeedsSupports(); void UpdateAge(const CoordsXY& sceneryPos); }; -assert_struct_size(SmallSceneryElement, 16); +static_assert(sizeof(SmallSceneryElement) == 16); struct LargeSceneryElement : TileElementBase { @@ -502,7 +502,7 @@ public: bool IsAccounted() const; void SetIsAccounted(bool isAccounted); }; -assert_struct_size(LargeSceneryElement, 16); +static_assert(sizeof(LargeSceneryElement) == 16); struct WallElement : TileElementBase { @@ -547,7 +547,7 @@ public: bool AnimationIsBackwards() const; void SetAnimationIsBackwards(bool isBackwards); }; -assert_struct_size(WallElement, 16); +static_assert(sizeof(WallElement) == 16); struct EntranceElement : TileElementBase { @@ -592,7 +592,7 @@ public: int32_t GetDirections() const; }; -assert_struct_size(EntranceElement, 16); +static_assert(sizeof(EntranceElement) == 16); struct BannerElement : TileElementBase { @@ -620,7 +620,7 @@ public: void SetAllowedEdges(uint8_t newEdges); void ResetAllowedEdges(); }; -assert_struct_size(BannerElement, 16); +static_assert(sizeof(BannerElement) == 16); #pragma pack(pop) From 2f2aa06b6682fda55e503507e71f2e0c35e9d8e9 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 16:05:29 +0200 Subject: [PATCH 07/13] Remove nameof macro --- src/openrct2/common.h | 3 --- src/openrct2/core/String.cpp | 2 +- src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h | 2 +- src/openrct2/ride/coaster/meta/AlpineCoaster.h | 2 +- src/openrct2/ride/coaster/meta/BobsleighCoaster.h | 2 +- src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/ClassicStandUpRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h | 2 +- src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h | 4 ++-- src/openrct2/ride/coaster/meta/GigaCoaster.h | 2 +- src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h | 2 +- src/openrct2/ride/coaster/meta/HybridCoaster.h | 2 +- src/openrct2/ride/coaster/meta/HyperTwister.h | 2 +- src/openrct2/ride/coaster/meta/Hypercoaster.h | 2 +- src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h | 2 +- src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h | 2 +- src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h | 4 ++-- src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/MineRide.h | 2 +- src/openrct2/ride/coaster/meta/MineTrainCoaster.h | 2 +- src/openrct2/ride/coaster/meta/MiniRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h | 2 +- src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h | 4 ++-- src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h | 2 +- src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/SpinningWildMouse.h | 2 +- src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/SteelWildMouse.h | 2 +- src/openrct2/ride/coaster/meta/Steeplechase.h | 2 +- src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h | 2 +- src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/VerticalDropCoaster.h | 2 +- src/openrct2/ride/coaster/meta/VirginiaReel.h | 2 +- src/openrct2/ride/coaster/meta/WaterCoaster.h | 2 +- src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/WoodenWildMouse.h | 2 +- src/openrct2/ride/gentle/meta/CarRide.h | 2 +- src/openrct2/ride/gentle/meta/Circus.h | 2 +- src/openrct2/ride/gentle/meta/CrookedHouse.h | 2 +- src/openrct2/ride/gentle/meta/Dodgems.h | 2 +- src/openrct2/ride/gentle/meta/FerrisWheel.h | 2 +- src/openrct2/ride/gentle/meta/FlyingSaucers.h | 2 +- src/openrct2/ride/gentle/meta/GhostTrain.h | 2 +- src/openrct2/ride/gentle/meta/HauntedHouse.h | 2 +- src/openrct2/ride/gentle/meta/Maze.h | 2 +- src/openrct2/ride/gentle/meta/MerryGoRound.h | 2 +- src/openrct2/ride/gentle/meta/MiniGolf.h | 2 +- src/openrct2/ride/gentle/meta/MiniHelicopters.h | 2 +- src/openrct2/ride/gentle/meta/MonorailCycles.h | 2 +- src/openrct2/ride/gentle/meta/MonsterTrucks.h | 2 +- src/openrct2/ride/gentle/meta/ObservationTower.h | 2 +- src/openrct2/ride/gentle/meta/SpaceRings.h | 2 +- src/openrct2/ride/gentle/meta/SpiralSlide.h | 2 +- src/openrct2/ride/shops/meta/CashMachine.h | 2 +- src/openrct2/ride/shops/meta/DrinkStall.h | 2 +- src/openrct2/ride/shops/meta/FirstAid.h | 2 +- src/openrct2/ride/shops/meta/FoodStall.h | 2 +- src/openrct2/ride/shops/meta/InformationKiosk.h | 2 +- src/openrct2/ride/shops/meta/Shop.h | 2 +- src/openrct2/ride/shops/meta/Toilets.h | 2 +- src/openrct2/ride/thrill/meta/3DCinema.h | 2 +- src/openrct2/ride/thrill/meta/Enterprise.h | 2 +- src/openrct2/ride/thrill/meta/GoKarts.h | 2 +- src/openrct2/ride/thrill/meta/LaunchedFreefall.h | 2 +- src/openrct2/ride/thrill/meta/MagicCarpet.h | 2 +- src/openrct2/ride/thrill/meta/MotionSimulator.h | 2 +- src/openrct2/ride/thrill/meta/RotoDrop.h | 2 +- src/openrct2/ride/thrill/meta/SwingingInverterShip.h | 2 +- src/openrct2/ride/thrill/meta/SwingingShip.h | 2 +- src/openrct2/ride/thrill/meta/TopSpin.h | 2 +- src/openrct2/ride/thrill/meta/Twist.h | 2 +- src/openrct2/ride/transport/meta/Chairlift.h | 2 +- src/openrct2/ride/transport/meta/Lift.h | 2 +- src/openrct2/ride/transport/meta/MiniatureRailway.h | 2 +- src/openrct2/ride/transport/meta/Monorail.h | 2 +- src/openrct2/ride/transport/meta/SuspendedMonorail.h | 2 +- src/openrct2/ride/water/meta/BoatHire.h | 2 +- src/openrct2/ride/water/meta/DinghySlide.h | 2 +- src/openrct2/ride/water/meta/LogFlume.h | 2 +- src/openrct2/ride/water/meta/RiverRafts.h | 2 +- src/openrct2/ride/water/meta/RiverRapids.h | 2 +- src/openrct2/ride/water/meta/SplashBoats.h | 2 +- src/openrct2/ride/water/meta/SubmarineRide.h | 2 +- 91 files changed, 93 insertions(+), 96 deletions(-) diff --git a/src/openrct2/common.h b/src/openrct2/common.h index ec843f1713..52a86dcc21 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -24,9 +24,6 @@ #include #include -// Gets the name of a symbol as a C string -#define nameof(symbol) #symbol - // Time (represented as number of 100-nanosecond intervals since 0001-01-01T00:00:00Z) using datetime64 = uint64_t; diff --git a/src/openrct2/core/String.cpp b/src/openrct2/core/String.cpp index f60f73ee95..1c32daf7ae 100644 --- a/src/openrct2/core/String.cpp +++ b/src/openrct2/core/String.cpp @@ -391,7 +391,7 @@ namespace String { if (delimiter.empty()) { - throw std::invalid_argument(nameof(delimiter) " can not be empty."); + throw std::invalid_argument("delimiter can not be empty."); } std::vector results; diff --git a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h index 7bc46aa78b..759ab51693 100644 --- a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h +++ b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor AirPoweredVerticalCoasterRTD = .LegacyBoosterSettings = { 40, 40 }, .Naming = { STR_RIDE_NAME_AIR_POWERED_VERTICAL_COASTER, STR_RIDE_DESCRIPTION_AIR_POWERED_VERTICAL_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER), + .EnumName = "RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 32, 4, 7, }, .MaxMass = 255, diff --git a/src/openrct2/ride/coaster/meta/AlpineCoaster.h b/src/openrct2/ride/coaster/meta/AlpineCoaster.h index cbb2cf71f7..26bbb3499d 100644 --- a/src/openrct2/ride/coaster/meta/AlpineCoaster.h +++ b/src/openrct2/ride/coaster/meta/AlpineCoaster.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor AlpineCoasterRTD = .TrackSpeedSettings = { 10, 10 }, .Naming = { STR_RIDE_NAME_ALPINE_COASTER, STR_RIDE_DESCRIPTION_ALPINE_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_ALPINE_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_ALPINE_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = {18, 24, 3, 7}, .MaxMass = 4, diff --git a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h index 87214d0be7..1a837dba9f 100644 --- a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h +++ b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h @@ -32,7 +32,7 @@ constexpr RideTypeDescriptor BobsleighCoasterRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_BOBSLEIGH_COASTER, STR_RIDE_DESCRIPTION_BOBSLEIGH_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_BOBSLEIGH_COASTER), + .EnumName = "RIDE_TYPE_BOBSLEIGH_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 19, 24, 5, 7, }, .MaxMass = 25, diff --git a/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h b/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h index 3b7c0ed675..d33ff7f3cd 100644 --- a/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor ClassicMiniRollerCoasterRTD = .LegacyBoosterSettings = { 17, 16, 1 }, .Naming = { STR_RIDE_NAME_CLASSIC_MINI_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CLASSIC_MINI_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_CLASSIC_MINI_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_CLASSIC_MINI_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 15, 24, 4, 7, }, .MaxMass = 18, diff --git a/src/openrct2/ride/coaster/meta/ClassicStandUpRollerCoaster.h b/src/openrct2/ride/coaster/meta/ClassicStandUpRollerCoaster.h index 58defc7f57..c5c2db8cc6 100644 --- a/src/openrct2/ride/coaster/meta/ClassicStandUpRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ClassicStandUpRollerCoaster.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor ClassicStandUpRollerCoasterRTD = .OperatingSettings = { 7, 27 }, .Naming = { STR_RIDE_NAME_CLASSIC_STAND_UP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CLASSIC_STAND_UP_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_CLASSIC_STAND_UP_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_CLASSIC_STAND_UP_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 30, 24, 9, 11, }, .MaxMass = 18, diff --git a/src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h b/src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h index 97f6fc1930..78b7924ea2 100644 --- a/src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor ClassicWoodenRollerCoasterRTD = .LegacyBoosterSettings = { 0, 68 }, .Naming = { STR_RIDE_NAME_CLASSIC_WOODEN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CLASSIC_WOODEN_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_CLASSIC_WOODEN_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_CLASSIC_WOODEN_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 24, 24, 8, 11, }, .MaxMass = 19, diff --git a/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h index 2b69741171..31155c34b5 100644 --- a/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h +++ b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h @@ -33,7 +33,7 @@ constexpr RideTypeDescriptor CompactInvertedCoasterRTD = .OperatingSettings = { 7, 27 }, .Naming = { STR_RIDE_NAME_COMPACT_INVERTED_COASTER, STR_RIDE_DESCRIPTION_COMPACT_INVERTED_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_COMPACT_INVERTED_COASTER), + .EnumName = "RIDE_TYPE_COMPACT_INVERTED_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 27, 40, 29, 8, }, .MaxMass = 18, diff --git a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h index 4e4a3a67a4..5942ee7228 100644 --- a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h @@ -37,7 +37,7 @@ constexpr RideTypeDescriptor CorkscrewRollerCoasterRTD = .LegacyBoosterSettings = { 25, 25 }, .Naming = { STR_RIDE_NAME_CORKSCREW_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CORKSCREW_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_CORKSCREW_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_CORKSCREW_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 28, 24, 8, 11, }, .MaxMass = 18, diff --git a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h index 497dbc1ebe..a36641479d 100644 --- a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor FlyingRollerCoasterRTD = .LegacyBoosterSettings = { 25, 25 }, .Naming = { STR_RIDE_NAME_FLYING_ROLLER_COASTER, STR_RIDE_DESCRIPTION_FLYING_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_FLYING_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_FLYING_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 30, 24, 8, 11, }, .MaxMass = 35, @@ -117,7 +117,7 @@ constexpr RideTypeDescriptor FlyingRollerCoasterAltRTD = .LegacyBoosterSettings = { 25, 25 }, .Naming = { STR_RIDE_NAME_3A, STR_RIDE_DESCRIPTION_UNKNOWN }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_FLYING_ROLLER_COASTER_ALT), + .EnumName = "RIDE_TYPE_FLYING_ROLLER_COASTER_ALT", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 30, 24, 8, 11, }, .MaxMass = 35, diff --git a/src/openrct2/ride/coaster/meta/GigaCoaster.h b/src/openrct2/ride/coaster/meta/GigaCoaster.h index cabf02afba..8e12913668 100644 --- a/src/openrct2/ride/coaster/meta/GigaCoaster.h +++ b/src/openrct2/ride/coaster/meta/GigaCoaster.h @@ -37,7 +37,7 @@ constexpr RideTypeDescriptor GigaCoasterRTD = .LegacyBoosterSettings = { 17, 68, 4 }, .Naming = { STR_RIDE_NAME_GIGA_COASTER, STR_RIDE_DESCRIPTION_GIGA_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_GIGA_COASTER), + .EnumName = "RIDE_TYPE_GIGA_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 86, 24, 9, 11, }, .MaxMass = 31, diff --git a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h index 725f416cad..46177f2907 100644 --- a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h +++ b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor HeartlineTwisterCoasterRTD = .LegacyBoosterSettings = { 25, 25 }, .Naming = { STR_RIDE_NAME_HEARTLINE_TWISTER_COASTER, STR_RIDE_DESCRIPTION_HEARTLINE_TWISTER_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_HEARTLINE_TWISTER_COASTER), + .EnumName = "RIDE_TYPE_HEARTLINE_TWISTER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 22, 24, 15, 9, }, .MaxMass = 18, diff --git a/src/openrct2/ride/coaster/meta/HybridCoaster.h b/src/openrct2/ride/coaster/meta/HybridCoaster.h index 585923b19c..4d40d04e54 100644 --- a/src/openrct2/ride/coaster/meta/HybridCoaster.h +++ b/src/openrct2/ride/coaster/meta/HybridCoaster.h @@ -32,7 +32,7 @@ constexpr RideTypeDescriptor HybridCoasterRTD = .LegacyBoosterSettings = { 15, 52 }, .Naming = { STR_RIDE_NAME_HYBRID_COASTER, STR_RIDE_DESCRIPTION_HYBRID_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_HYBRID_COASTER), + .EnumName = "RIDE_TYPE_HYBRID_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 43, 24, 13, 13}, .MaxMass = 18, diff --git a/src/openrct2/ride/coaster/meta/HyperTwister.h b/src/openrct2/ride/coaster/meta/HyperTwister.h index 5d0e251f36..7b1590ec51 100644 --- a/src/openrct2/ride/coaster/meta/HyperTwister.h +++ b/src/openrct2/ride/coaster/meta/HyperTwister.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor HyperTwisterRTD = .LegacyBoosterSettings = { 17, 68 }, .Naming = { STR_RIDE_NAME_HYPER_TWISTER, STR_RIDE_DESCRIPTION_HYPER_TWISTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station}, - .EnumName = nameof(RIDE_TYPE_HYPER_TWISTER), + .EnumName = "RIDE_TYPE_HYPER_TWISTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 61, 24, 8, 9, }, .MaxMass = 31, diff --git a/src/openrct2/ride/coaster/meta/Hypercoaster.h b/src/openrct2/ride/coaster/meta/Hypercoaster.h index b31fdad773..c6ccfd8d4c 100644 --- a/src/openrct2/ride/coaster/meta/Hypercoaster.h +++ b/src/openrct2/ride/coaster/meta/Hypercoaster.h @@ -37,7 +37,7 @@ constexpr RideTypeDescriptor HypercoasterRTD = .LegacyBoosterSettings = { 25, 25 }, .Naming = { STR_RIDE_NAME_HYPERCOASTER, STR_RIDE_DESCRIPTION_HYPERCOASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_HYPERCOASTER), + .EnumName = "RIDE_TYPE_HYPERCOASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 55, 24, 8, 11, }, .MaxMass = 18, diff --git a/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h index ab95f29140..320cde8cf7 100644 --- a/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h @@ -32,7 +32,7 @@ constexpr RideTypeDescriptor InvertedHairpinCoasterRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_INVERTED_HAIRPIN_COASTER, STR_RIDE_DESCRIPTION_INVERTED_HAIRPIN_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_INVERTED_HAIRPIN_COASTER), + .EnumName = "RIDE_TYPE_INVERTED_HAIRPIN_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 16, 24, 24, 7, }, .MaxMass = 4, diff --git a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h index 8dfccab133..764fef7384 100644 --- a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor InvertedImpulseCoasterRTD = .LegacyBoosterSettings = { 25, 25 }, .Naming = { STR_RIDE_NAME_INVERTED_IMPULSE_COASTER, STR_RIDE_DESCRIPTION_INVERTED_IMPULSE_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_INVERTED_IMPULSE_COASTER), + .EnumName = "RIDE_TYPE_INVERTED_IMPULSE_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 45, 40, 29, 8, }, .MaxMass = 23, diff --git a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h index ee8baaa6f2..c2401e0673 100644 --- a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor InvertedRollerCoasterRTD = .LegacyBoosterSettings = { 0, 38 }, .Naming = { STR_RIDE_NAME_INVERTED_ROLLER_COASTER, STR_RIDE_DESCRIPTION_INVERTED_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_INVERTED_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_INVERTED_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 42, 40, 29, 8, }, .MaxMass = 27, diff --git a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h index bcb95e2b38..96bb85f731 100644 --- a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor JuniorRollerCoasterRTD = .LegacyBoosterSettings = { 17, 16, 1 }, .Naming = { STR_RIDE_NAME_JUNIOR_ROLLER_COASTER, STR_RIDE_DESCRIPTION_JUNIOR_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_JUNIOR_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_JUNIOR_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 12, 24, 4, 7, }, .MaxMass = 18, diff --git a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h index ddb8717fe5..7ed4d12858 100644 --- a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor LIMLaunchedRollerCoasterRTD = .LegacyBoosterSettings = { 18, 52 }, .Naming = { STR_RIDE_NAME_LIM_LAUNCHED_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LIM_LAUNCHED_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 35, 24, 5, 7, }, .MaxMass = 18, diff --git a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h index c55c40854b..8765c9155b 100644 --- a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h @@ -44,7 +44,7 @@ constexpr RideTypeDescriptor LayDownRollerCoasterRTD = .LegacyBoosterSettings = { 25, 25 }, .Naming = { STR_RIDE_NAME_LAY_DOWN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LAY_DOWN_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_LAY_DOWN_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_LAY_DOWN_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 26, 24, 8, 11, }, .MaxMass = 25, @@ -116,7 +116,7 @@ constexpr RideTypeDescriptor LayDownRollerCoasterAltRTD = .LegacyBoosterSettings = { 25, 25 }, .Naming = { STR_RIDE_NAME_40, STR_RIDE_DESCRIPTION_UNKNOWN }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT), + .EnumName = "RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 26, 24, 8, 11, }, .MaxMass = 25, diff --git a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h index 07f32c021f..b5ba67081b 100644 --- a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor LoopingRollerCoasterRTD = .LegacyBoosterSettings = { 18, 18 }, .Naming = { STR_RIDE_NAME_LOOPING_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LOOPING_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_LOOPING_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_LOOPING_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 35, 24, 5, 7, }, .MaxMass = 18, diff --git a/src/openrct2/ride/coaster/meta/MineRide.h b/src/openrct2/ride/coaster/meta/MineRide.h index 4aff739306..2788f22e85 100644 --- a/src/openrct2/ride/coaster/meta/MineRide.h +++ b/src/openrct2/ride/coaster/meta/MineRide.h @@ -33,7 +33,7 @@ constexpr RideTypeDescriptor MineRideRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_MINE_RIDE, STR_RIDE_DESCRIPTION_MINE_RIDE }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MINE_RIDE), + .EnumName = "RIDE_TYPE_MINE_RIDE", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 13, 24, 9, 11, }, .MaxMass = 27, diff --git a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h index fcdf2fdafe..85668ac310 100644 --- a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h +++ b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor MineTrainCoasterRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_MINE_TRAIN_COASTER, STR_RIDE_DESCRIPTION_MINE_TRAIN_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MINE_TRAIN_COASTER), + .EnumName = "RIDE_TYPE_MINE_TRAIN_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 21, 24, 4, 7, }, .MaxMass = 15, diff --git a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h index 768efb827b..84144ec2a5 100644 --- a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor MiniRollerCoasterRTD = .LegacyBoosterSettings = { 0, 68, 4 }, .Naming = { STR_RIDE_NAME_MINI_ROLLER_COASTER, STR_RIDE_DESCRIPTION_MINI_ROLLER_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MINI_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_MINI_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 16, 24, 9, 11, }, .MaxMass = 10, diff --git a/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h index 23ff28fd78..3302df9ae6 100644 --- a/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h +++ b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h @@ -33,7 +33,7 @@ constexpr RideTypeDescriptor MiniSuspendedCoasterRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_MINI_SUSPENDED_COASTER, STR_RIDE_DESCRIPTION_MINI_SUSPENDED_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MINI_SUSPENDED_COASTER), + .EnumName = "RIDE_TYPE_MINI_SUSPENDED_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 10, 24, 24, 8, }, .MaxMass = 3, diff --git a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h index af0d2d9f62..124b2c78f2 100644 --- a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterRTD = .LegacyBoosterSettings = { 25, 25 }, .Naming = { STR_RIDE_NAME_MULTI_DIMENSION_ROLLER_COASTER, STR_RIDE_DESCRIPTION_MULTI_DIMENSION_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 40, 24, 8, 11, }, .MaxMass = 78, @@ -116,7 +116,7 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterAltRTD = .LegacyBoosterSettings = { 25, 25 }, .Naming = { STR_RIDE_NAME_38, STR_RIDE_DESCRIPTION_UNKNOWN }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT), + .EnumName = "RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 40, 24, 8, 11, }, .MaxMass = 78, diff --git a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h index 43b9074cb0..b6c0a15937 100644 --- a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor ReverseFreefallCoasterRTD = .LegacyBoosterSettings = { 40, 40 }, .Naming = { STR_RIDE_NAME_REVERSE_FREEFALL_COASTER, STR_RIDE_DESCRIPTION_REVERSE_FREEFALL_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_REVERSE_FREEFALL_COASTER), + .EnumName = "RIDE_TYPE_REVERSE_FREEFALL_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 32, 4, 7, }, .MaxMass = 255, diff --git a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h index 2a6023d514..6b3e81ec4a 100644 --- a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h @@ -31,7 +31,7 @@ constexpr RideTypeDescriptor ReverserRollerCoasterRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_REVERSER_ROLLER_COASTER, STR_RIDE_DESCRIPTION_REVERSER_ROLLER_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_REVERSER_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_REVERSER_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 18, 24, 8, 11, }, .MaxMass = 15, diff --git a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h index f5dbe34aa7..bf5489d507 100644 --- a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h @@ -33,7 +33,7 @@ constexpr RideTypeDescriptor SideFrictionRollerCoasterRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_SIDE_FRICTION_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SIDE_FRICTION_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 18, 24, 4, 11, }, .MaxMass = 15, diff --git a/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h b/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h index b32a6bdd8a..820f0390a3 100644 --- a/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h @@ -33,7 +33,7 @@ constexpr RideTypeDescriptor SingleRailRollerCoasterRTD = .LegacyBoosterSettings = { 15, 52 }, .Naming = { STR_RIDE_NAME_SINGLE_RAIL_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SINGLE_RAIL_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_SINGLE_RAIL_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_SINGLE_RAIL_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 28, 24, 5, 7}, .MaxMass = 18, diff --git a/src/openrct2/ride/coaster/meta/SpinningWildMouse.h b/src/openrct2/ride/coaster/meta/SpinningWildMouse.h index 5f89083b7d..94b4463e71 100644 --- a/src/openrct2/ride/coaster/meta/SpinningWildMouse.h +++ b/src/openrct2/ride/coaster/meta/SpinningWildMouse.h @@ -30,7 +30,7 @@ constexpr RideTypeDescriptor SpinningWildMouseRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_SPINNING_WILD_MOUSE, STR_RIDE_DESCRIPTION_SPINNING_WILD_MOUSE }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_SPINNING_WILD_MOUSE), + .EnumName = "RIDE_TYPE_SPINNING_WILD_MOUSE", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 16, 24, 4, 7, }, .MaxMass = 4, diff --git a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h index 31e7c01fff..0e89507ddb 100644 --- a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor SpiralRollerCoasterRTD = .LegacyBoosterSettings = { 17, 17 }, .Naming = { STR_RIDE_NAME_SPIRAL_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SPIRAL_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_SPIRAL_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_SPIRAL_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 19, 24, 9, 11, }, .MaxMass = 31, diff --git a/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h index 058127a68b..f6d3241d0e 100644 --- a/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor StandUpRollerCoasterRTD = .OperatingSettings = { 7, 27 }, .Naming = { STR_RIDE_NAME_STAND_UP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_STAND_UP_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_STAND_UP_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_STAND_UP_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 25, 24, 9, 11, }, .MaxMass = 18, diff --git a/src/openrct2/ride/coaster/meta/SteelWildMouse.h b/src/openrct2/ride/coaster/meta/SteelWildMouse.h index cc89bfc6c1..624b9bcdc9 100644 --- a/src/openrct2/ride/coaster/meta/SteelWildMouse.h +++ b/src/openrct2/ride/coaster/meta/SteelWildMouse.h @@ -32,7 +32,7 @@ constexpr RideTypeDescriptor SteelWildMouseRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_WILD_MOUSE, STR_RIDE_DESCRIPTION_WILD_MOUSE }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_STEEL_WILD_MOUSE), + .EnumName = "RIDE_TYPE_STEEL_WILD_MOUSE", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 16, 24, 4, 7, }, .MaxMass = 4, diff --git a/src/openrct2/ride/coaster/meta/Steeplechase.h b/src/openrct2/ride/coaster/meta/Steeplechase.h index 06e225cb30..51a1ccf91f 100644 --- a/src/openrct2/ride/coaster/meta/Steeplechase.h +++ b/src/openrct2/ride/coaster/meta/Steeplechase.h @@ -32,7 +32,7 @@ constexpr RideTypeDescriptor SteeplechaseRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_STEEPLECHASE, STR_RIDE_DESCRIPTION_STEEPLECHASE }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_STEEPLECHASE), + .EnumName = "RIDE_TYPE_STEEPLECHASE", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 14, 24, 7, 7, }, .MaxMass = 4, diff --git a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h index d933f43888..2fdc2a4bcd 100644 --- a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h +++ b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h @@ -32,7 +32,7 @@ constexpr RideTypeDescriptor SuspendedSwingingCoasterRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_SUSPENDED_SWINGING_COASTER, STR_RIDE_DESCRIPTION_SUSPENDED_SWINGING_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_SUSPENDED_SWINGING_COASTER), + .EnumName = "RIDE_TYPE_SUSPENDED_SWINGING_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 24, 40, 29, 8, }, .MaxMass = 26, diff --git a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h index adc4617baa..8607b5d8d1 100644 --- a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor TwisterRollerCoasterRTD = .LegacyBoosterSettings = { 17, 68 }, .Naming = { STR_RIDE_NAME_TWISTER_ROLLER_COASTER, STR_RIDE_DESCRIPTION_TWISTER_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_TWISTER_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_TWISTER_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 40, 24, 8, 9, }, .MaxMass = 31, diff --git a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h index 3443e3a6fb..0d88fe2b71 100644 --- a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h +++ b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h @@ -37,7 +37,7 @@ constexpr RideTypeDescriptor VerticalDropCoasterRTD = .LegacyBoosterSettings = { 17, 68 }, .Naming = { STR_RIDE_NAME_VERTICAL_DROP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_VERTICAL_DROP_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 55, 24, 8, 11, }, .MaxMass = 25, diff --git a/src/openrct2/ride/coaster/meta/VirginiaReel.h b/src/openrct2/ride/coaster/meta/VirginiaReel.h index 60b3897e34..09b0d321fe 100644 --- a/src/openrct2/ride/coaster/meta/VirginiaReel.h +++ b/src/openrct2/ride/coaster/meta/VirginiaReel.h @@ -31,7 +31,7 @@ constexpr RideTypeDescriptor VirginiaReelRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_VIRGINIA_REEL, STR_RIDE_DESCRIPTION_VIRGINIA_REEL }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_VIRGINIA_REEL), + .EnumName = "RIDE_TYPE_VIRGINIA_REEL", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 14, 24, 6, 7, }, .MaxMass = 15, diff --git a/src/openrct2/ride/coaster/meta/WaterCoaster.h b/src/openrct2/ride/coaster/meta/WaterCoaster.h index 3345b05cdc..b2421031e0 100644 --- a/src/openrct2/ride/coaster/meta/WaterCoaster.h +++ b/src/openrct2/ride/coaster/meta/WaterCoaster.h @@ -43,7 +43,7 @@ constexpr RideTypeDescriptor WaterCoasterRTD = .LegacyBoosterSettings = { 17, 16, 1 }, .Naming = { STR_RIDE_NAME_WATER_COASTER, STR_RIDE_DESCRIPTION_WATER_COASTER }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_WATER_COASTER), + .EnumName = "RIDE_TYPE_WATER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 18, 24, 4, 7, }, .MaxMass = 13, diff --git a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h index faa6402e1e..645a360811 100644 --- a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor WoodenRollerCoasterRTD = .LegacyBoosterSettings = { 0, 68 }, .Naming = { STR_RIDE_NAME_WOODEN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_WOODEN_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_WOODEN_ROLLER_COASTER), + .EnumName = "RIDE_TYPE_WOODEN_ROLLER_COASTER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 41, 24, 8, 11, }, .MaxMass = 19, diff --git a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h index 7c2c9aad38..3abc606a84 100644 --- a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h +++ b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h @@ -33,7 +33,7 @@ constexpr RideTypeDescriptor WoodenWildMouseRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_WOODEN_WILD_MOUSE, STR_RIDE_DESCRIPTION_WOODEN_WILD_MOUSE }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_WOODEN_WILD_MOUSE), + .EnumName = "RIDE_TYPE_WOODEN_WILD_MOUSE", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 14, 24, 4, 7, }, .MaxMass = 4, diff --git a/src/openrct2/ride/gentle/meta/CarRide.h b/src/openrct2/ride/gentle/meta/CarRide.h index 26b4e81387..9e28523e60 100644 --- a/src/openrct2/ride/gentle/meta/CarRide.h +++ b/src/openrct2/ride/gentle/meta/CarRide.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor CarRideRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_CAR_RIDE, STR_RIDE_DESCRIPTION_CAR_RIDE }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_CAR_RIDE), + .EnumName = "RIDE_TYPE_CAR_RIDE", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 6, 24, 4, 7, }, .MaxMass = 2, diff --git a/src/openrct2/ride/gentle/meta/Circus.h b/src/openrct2/ride/gentle/meta/Circus.h index 49ad415941..a62516cf40 100644 --- a/src/openrct2/ride/gentle/meta/Circus.h +++ b/src/openrct2/ride/gentle/meta/Circus.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor CircusRTD = .DefaultMode = RideMode::Circus, .Naming = { STR_RIDE_NAME_CIRCUS, STR_RIDE_DESCRIPTION_CIRCUS }, .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_CIRCUS), + .EnumName = "RIDE_TYPE_CIRCUS", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 12, 128, 3, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/gentle/meta/CrookedHouse.h b/src/openrct2/ride/gentle/meta/CrookedHouse.h index 30e1482b86..0e8c4cda6f 100644 --- a/src/openrct2/ride/gentle/meta/CrookedHouse.h +++ b/src/openrct2/ride/gentle/meta/CrookedHouse.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor CrookedHouseRTD = .DefaultMode = RideMode::CrookedHouse, .Naming = { STR_RIDE_NAME_CROOKED_HOUSE, STR_RIDE_DESCRIPTION_CROOKED_HOUSE }, .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_CROOKED_HOUSE), + .EnumName = "RIDE_TYPE_CROOKED_HOUSE", .AvailableBreakdowns = 0, .Heights = { 16, 96, 3, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/gentle/meta/Dodgems.h b/src/openrct2/ride/gentle/meta/Dodgems.h index 10173cab15..2d768416f1 100644 --- a/src/openrct2/ride/gentle/meta/Dodgems.h +++ b/src/openrct2/ride/gentle/meta/Dodgems.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor DodgemsRTD = .OperatingSettings = { 20, 180 }, .Naming = { STR_RIDE_NAME_DODGEMS, STR_RIDE_DESCRIPTION_DODGEMS }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_DODGEMS), + .EnumName = "RIDE_TYPE_DODGEMS", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 9, 48, 2, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/gentle/meta/FerrisWheel.h b/src/openrct2/ride/gentle/meta/FerrisWheel.h index 5e05b0739f..f99f023ae5 100644 --- a/src/openrct2/ride/gentle/meta/FerrisWheel.h +++ b/src/openrct2/ride/gentle/meta/FerrisWheel.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor FerrisWheelRTD = .OperatingSettings = { 1, 3 }, .Naming = { STR_RIDE_NAME_FERRIS_WHEEL, STR_RIDE_DESCRIPTION_FERRIS_WHEEL }, .NameConvention = { RideComponentType::Wheel, RideComponentType::Structure, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_FERRIS_WHEEL), + .EnumName = "RIDE_TYPE_FERRIS_WHEEL", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 16, 176, 3, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/gentle/meta/FlyingSaucers.h b/src/openrct2/ride/gentle/meta/FlyingSaucers.h index 3deb2a2805..642d924d03 100644 --- a/src/openrct2/ride/gentle/meta/FlyingSaucers.h +++ b/src/openrct2/ride/gentle/meta/FlyingSaucers.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor FlyingSaucersRTD = .OperatingSettings = { 20, 180 }, .Naming = { STR_RIDE_NAME_FLYING_SAUCERS, STR_RIDE_DESCRIPTION_FLYING_SAUCERS }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_FLYING_SAUCERS), + .EnumName = "RIDE_TYPE_FLYING_SAUCERS", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 9, 48, 2, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/gentle/meta/GhostTrain.h b/src/openrct2/ride/gentle/meta/GhostTrain.h index 72787bc260..5d58202eeb 100644 --- a/src/openrct2/ride/gentle/meta/GhostTrain.h +++ b/src/openrct2/ride/gentle/meta/GhostTrain.h @@ -37,7 +37,7 @@ constexpr RideTypeDescriptor GhostTrainRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_GHOST_TRAIN, STR_RIDE_DESCRIPTION_GHOST_TRAIN }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_GHOST_TRAIN), + .EnumName = "RIDE_TYPE_GHOST_TRAIN", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 8, 24, 6, 7, }, .MaxMass = 2, diff --git a/src/openrct2/ride/gentle/meta/HauntedHouse.h b/src/openrct2/ride/gentle/meta/HauntedHouse.h index 125e6b7105..e41c937570 100644 --- a/src/openrct2/ride/gentle/meta/HauntedHouse.h +++ b/src/openrct2/ride/gentle/meta/HauntedHouse.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor HauntedHouseRTD = .DefaultMode = RideMode::HauntedHouse, .Naming = { STR_RIDE_NAME_HAUNTED_HOUSE, STR_RIDE_DESCRIPTION_HAUNTED_HOUSE }, .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_HAUNTED_HOUSE), + .EnumName = "RIDE_TYPE_HAUNTED_HOUSE", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 16, 160, 3, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/gentle/meta/Maze.h b/src/openrct2/ride/gentle/meta/Maze.h index d2b36fbc77..a913015776 100644 --- a/src/openrct2/ride/gentle/meta/Maze.h +++ b/src/openrct2/ride/gentle/meta/Maze.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor MazeRTD = .OperatingSettings = { 1, 64 }, .Naming = { STR_RIDE_NAME_MAZE, STR_RIDE_DESCRIPTION_MAZE }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MAZE), + .EnumName = "RIDE_TYPE_MAZE", .AvailableBreakdowns = 0, .Heights = { 6, 24, 0, 1, }, .MaxMass = 18, diff --git a/src/openrct2/ride/gentle/meta/MerryGoRound.h b/src/openrct2/ride/gentle/meta/MerryGoRound.h index eebf41e5d0..f6b13a6e15 100644 --- a/src/openrct2/ride/gentle/meta/MerryGoRound.h +++ b/src/openrct2/ride/gentle/meta/MerryGoRound.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor MerryGoRoundRTD = .OperatingSettings = { 4, 25 }, .Naming = { STR_RIDE_NAME_MERRY_GO_ROUND, STR_RIDE_DESCRIPTION_MERRY_GO_ROUND }, .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MERRY_GO_ROUND), + .EnumName = "RIDE_TYPE_MERRY_GO_ROUND", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), .Heights = { 12, 64, 3, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/gentle/meta/MiniGolf.h b/src/openrct2/ride/gentle/meta/MiniGolf.h index 0f79e00e58..190d5f0dae 100644 --- a/src/openrct2/ride/gentle/meta/MiniGolf.h +++ b/src/openrct2/ride/gentle/meta/MiniGolf.h @@ -32,7 +32,7 @@ constexpr RideTypeDescriptor MiniGolfRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_MINI_GOLF, STR_RIDE_DESCRIPTION_MINI_GOLF }, .NameConvention = { RideComponentType::Player, RideComponentType::Course, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MINI_GOLF), + .EnumName = "RIDE_TYPE_MINI_GOLF", .AvailableBreakdowns = 0, .Heights = { 7, 32, 2, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/gentle/meta/MiniHelicopters.h b/src/openrct2/ride/gentle/meta/MiniHelicopters.h index 6939100869..742bbc211b 100644 --- a/src/openrct2/ride/gentle/meta/MiniHelicopters.h +++ b/src/openrct2/ride/gentle/meta/MiniHelicopters.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor MiniHelicoptersRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_MINI_HELICOPTERS, STR_RIDE_DESCRIPTION_MINI_HELICOPTERS }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MINI_HELICOPTERS), + .EnumName = "RIDE_TYPE_MINI_HELICOPTERS", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 7, 24, 4, 7, }, .MaxMass = 2, diff --git a/src/openrct2/ride/gentle/meta/MonorailCycles.h b/src/openrct2/ride/gentle/meta/MonorailCycles.h index d589f09922..54e6c43106 100644 --- a/src/openrct2/ride/gentle/meta/MonorailCycles.h +++ b/src/openrct2/ride/gentle/meta/MonorailCycles.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor MonorailCyclesRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_MONORAIL_CYCLES, STR_RIDE_DESCRIPTION_MONORAIL_CYCLES }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MONORAIL_CYCLES), + .EnumName = "RIDE_TYPE_MONORAIL_CYCLES", .AvailableBreakdowns = (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 5, 24, 8, 7, }, .MaxMass = 2, diff --git a/src/openrct2/ride/gentle/meta/MonsterTrucks.h b/src/openrct2/ride/gentle/meta/MonsterTrucks.h index a6489bd0e5..960226f1d3 100644 --- a/src/openrct2/ride/gentle/meta/MonsterTrucks.h +++ b/src/openrct2/ride/gentle/meta/MonsterTrucks.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor MonsterTrucksRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_MONSTER_TRUCKS, STR_RIDE_DESCRIPTION_MONSTER_TRUCKS }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MONSTER_TRUCKS), + .EnumName = "RIDE_TYPE_MONSTER_TRUCKS", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 18, 24, 4, 7, }, .MaxMass = 2, diff --git a/src/openrct2/ride/gentle/meta/ObservationTower.h b/src/openrct2/ride/gentle/meta/ObservationTower.h index 4eee41be55..e8ac44b01a 100644 --- a/src/openrct2/ride/gentle/meta/ObservationTower.h +++ b/src/openrct2/ride/gentle/meta/ObservationTower.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor ObservationTowerRTD = .DefaultMode = RideMode::RotatingLift, .Naming = { STR_RIDE_NAME_OBSERVATION_TOWER, STR_RIDE_DESCRIPTION_OBSERVATION_TOWER }, .NameConvention = { RideComponentType::Cabin, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_OBSERVATION_TOWER), + .EnumName = "RIDE_TYPE_OBSERVATION_TOWER", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 32, 3, 2, }, .MaxMass = 15, diff --git a/src/openrct2/ride/gentle/meta/SpaceRings.h b/src/openrct2/ride/gentle/meta/SpaceRings.h index 6f8f806f8a..b4ce4342d0 100644 --- a/src/openrct2/ride/gentle/meta/SpaceRings.h +++ b/src/openrct2/ride/gentle/meta/SpaceRings.h @@ -33,7 +33,7 @@ constexpr RideTypeDescriptor SpaceRingsRTD = .DefaultMode = RideMode::SpaceRings, .Naming = { STR_RIDE_NAME_SPACE_RINGS, STR_RIDE_DESCRIPTION_SPACE_RINGS }, .NameConvention = { RideComponentType::Ring, RideComponentType::Structure, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_SPACE_RINGS), + .EnumName = "RIDE_TYPE_SPACE_RINGS", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 16, 48, 3, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/gentle/meta/SpiralSlide.h b/src/openrct2/ride/gentle/meta/SpiralSlide.h index cee4835f4b..32e8d330a5 100644 --- a/src/openrct2/ride/gentle/meta/SpiralSlide.h +++ b/src/openrct2/ride/gentle/meta/SpiralSlide.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor SpiralSlideRTD = .OperatingSettings = { 1, 5 }, .Naming = { STR_RIDE_NAME_SPIRAL_SLIDE, STR_RIDE_DESCRIPTION_SPIRAL_SLIDE }, .NameConvention = { RideComponentType::Train, RideComponentType::Building, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_SPIRAL_SLIDE), + .EnumName = "RIDE_TYPE_SPIRAL_SLIDE", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 15, 128, 0, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/shops/meta/CashMachine.h b/src/openrct2/ride/shops/meta/CashMachine.h index fd7672e7df..5598b70b02 100644 --- a/src/openrct2/ride/shops/meta/CashMachine.h +++ b/src/openrct2/ride/shops/meta/CashMachine.h @@ -31,7 +31,7 @@ constexpr RideTypeDescriptor CashMachineRTD = .DefaultMode = RideMode::ShopStall, .Naming = { STR_RIDE_NAME_CASH_MACHINE, STR_RIDE_DESCRIPTION_CASH_MACHINE }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_CASH_MACHINE), + .EnumName = "RIDE_TYPE_CASH_MACHINE", .AvailableBreakdowns = 0, .Heights = { 12, DefaultCashMachineHeight, 0, 0, }, .MaxMass = 255, diff --git a/src/openrct2/ride/shops/meta/DrinkStall.h b/src/openrct2/ride/shops/meta/DrinkStall.h index 5f29797681..c2e5af706c 100644 --- a/src/openrct2/ride/shops/meta/DrinkStall.h +++ b/src/openrct2/ride/shops/meta/DrinkStall.h @@ -32,7 +32,7 @@ constexpr RideTypeDescriptor DrinkStallRTD = .DefaultMode = RideMode::ShopStall, .Naming = { STR_RIDE_NAME_DRINK_STALL, STR_RIDE_DESCRIPTION_DRINK_STALL }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_DRINK_STALL), + .EnumName = "RIDE_TYPE_DRINK_STALL", .AvailableBreakdowns = 0, .Heights = { 12, DefaultDrinksStallHeight, 0, 0, }, .MaxMass = 255, diff --git a/src/openrct2/ride/shops/meta/FirstAid.h b/src/openrct2/ride/shops/meta/FirstAid.h index 59758ab901..57fe47b211 100644 --- a/src/openrct2/ride/shops/meta/FirstAid.h +++ b/src/openrct2/ride/shops/meta/FirstAid.h @@ -33,7 +33,7 @@ constexpr RideTypeDescriptor FirstAidRTD = .OperatingSettings = { 8, 8 }, .Naming = { STR_RIDE_NAME_FIRST_AID, STR_RIDE_DESCRIPTION_FIRST_AID }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_FIRST_AID), + .EnumName = "RIDE_TYPE_FIRST_AID", .AvailableBreakdowns = 0, .Heights = { 12, DefaultFirstAidHeight, 0, 0, }, .MaxMass = 255, diff --git a/src/openrct2/ride/shops/meta/FoodStall.h b/src/openrct2/ride/shops/meta/FoodStall.h index c357df56dc..3a11a433e4 100644 --- a/src/openrct2/ride/shops/meta/FoodStall.h +++ b/src/openrct2/ride/shops/meta/FoodStall.h @@ -32,7 +32,7 @@ constexpr RideTypeDescriptor FoodStallRTD = .DefaultMode = RideMode::ShopStall, .Naming = { STR_RIDE_NAME_FOOD_STALL, STR_RIDE_DESCRIPTION_FOOD_STALL }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_FOOD_STALL), + .EnumName = "RIDE_TYPE_FOOD_STALL", .AvailableBreakdowns = 0, .Heights = { 12, DefaultFoodStallHeight, 0, 0, }, .MaxMass = 255, diff --git a/src/openrct2/ride/shops/meta/InformationKiosk.h b/src/openrct2/ride/shops/meta/InformationKiosk.h index 836abeac2c..6785fc7150 100644 --- a/src/openrct2/ride/shops/meta/InformationKiosk.h +++ b/src/openrct2/ride/shops/meta/InformationKiosk.h @@ -32,7 +32,7 @@ constexpr RideTypeDescriptor InformationKioskRTD = .DefaultMode = RideMode::ShopStall, .Naming = { STR_RIDE_NAME_INFORMATION_KIOSK, STR_RIDE_DESCRIPTION_INFORMATION_KIOSK }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_INFORMATION_KIOSK), + .EnumName = "RIDE_TYPE_INFORMATION_KIOSK", .AvailableBreakdowns = 0, .Heights = { 12, DefaultInformationKioskHeight, 0, 0, }, .MaxMass = 255, diff --git a/src/openrct2/ride/shops/meta/Shop.h b/src/openrct2/ride/shops/meta/Shop.h index cc4dfb1dfb..425fb73a8c 100644 --- a/src/openrct2/ride/shops/meta/Shop.h +++ b/src/openrct2/ride/shops/meta/Shop.h @@ -32,7 +32,7 @@ constexpr RideTypeDescriptor ShopRTD = .DefaultMode = RideMode::ShopStall, .Naming = { STR_RIDE_NAME_SHOP, STR_RIDE_DESCRIPTION_SHOP }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_SHOP), + .EnumName = "RIDE_TYPE_SHOP", .AvailableBreakdowns = 0, .Heights = { 12, DefaultShopHeight, 0, 0, }, .MaxMass = 255, diff --git a/src/openrct2/ride/shops/meta/Toilets.h b/src/openrct2/ride/shops/meta/Toilets.h index b5b254f379..5d64e8946f 100644 --- a/src/openrct2/ride/shops/meta/Toilets.h +++ b/src/openrct2/ride/shops/meta/Toilets.h @@ -33,7 +33,7 @@ constexpr RideTypeDescriptor ToiletsRTD = .OperatingSettings = { 4, 4 }, .Naming = { STR_RIDE_NAME_TOILETS, STR_RIDE_DESCRIPTION_TOILETS }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_TOILETS), + .EnumName = "RIDE_TYPE_TOILETS", .AvailableBreakdowns = 0, .Heights = { 12, DefaultToiletHeight, 0, 0, }, .MaxMass = 255, diff --git a/src/openrct2/ride/thrill/meta/3DCinema.h b/src/openrct2/ride/thrill/meta/3DCinema.h index 855a1670e9..57b330c774 100644 --- a/src/openrct2/ride/thrill/meta/3DCinema.h +++ b/src/openrct2/ride/thrill/meta/3DCinema.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor CinemaRTD = .DefaultMode = RideMode::MouseTails3DFilm, .Naming = { STR_RIDE_NAME_3D_CINEMA, STR_RIDE_DESCRIPTION_3D_CINEMA }, .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_3D_CINEMA), + .EnumName = "RIDE_TYPE_3D_CINEMA", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 12, 128, 3, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/thrill/meta/Enterprise.h b/src/openrct2/ride/thrill/meta/Enterprise.h index 373ea482ff..5d507aef3e 100644 --- a/src/openrct2/ride/thrill/meta/Enterprise.h +++ b/src/openrct2/ride/thrill/meta/Enterprise.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor EnterpriseRTD = .OperatingSettings = { 10, 20 }, .Naming = { STR_RIDE_NAME_ENTERPRISE, STR_RIDE_DESCRIPTION_ENTERPRISE }, .NameConvention = { RideComponentType::Wheel, RideComponentType::Structure, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_ENTERPRISE), + .EnumName = "RIDE_TYPE_ENTERPRISE", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 16, 160, 3, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/thrill/meta/GoKarts.h b/src/openrct2/ride/thrill/meta/GoKarts.h index d69cec500f..8ff2aa5067 100644 --- a/src/openrct2/ride/thrill/meta/GoKarts.h +++ b/src/openrct2/ride/thrill/meta/GoKarts.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor GoKartsRTD = .OperatingSettings = { 1, 10 }, .Naming = { STR_RIDE_NAME_GO_KARTS, STR_RIDE_DESCRIPTION_GO_KARTS }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_GO_KARTS), + .EnumName = "RIDE_TYPE_GO_KARTS", .AvailableBreakdowns = (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 7, 24, 2, 1, }, .MaxMass = 255, diff --git a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h index 2248acbc07..8e18c4b83c 100644 --- a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h +++ b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor LaunchedFreefallRTD = .OperatingSettings = { 10, 40 }, .Naming = { STR_RIDE_NAME_LAUNCHED_FREEFALL, STR_RIDE_DESCRIPTION_LAUNCHED_FREEFALL }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_LAUNCHED_FREEFALL), + .EnumName = "RIDE_TYPE_LAUNCHED_FREEFALL", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 32, 3, 2, }, .MaxMass = 15, diff --git a/src/openrct2/ride/thrill/meta/MagicCarpet.h b/src/openrct2/ride/thrill/meta/MagicCarpet.h index 1e8c8647db..cc97af0287 100644 --- a/src/openrct2/ride/thrill/meta/MagicCarpet.h +++ b/src/openrct2/ride/thrill/meta/MagicCarpet.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor MagicCarpetRTD = .OperatingSettings = { 7, 15 }, .Naming = { STR_RIDE_NAME_MAGIC_CARPET, STR_RIDE_DESCRIPTION_MAGIC_CARPET }, .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MAGIC_CARPET), + .EnumName = "RIDE_TYPE_MAGIC_CARPET", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 15, 176, 7, 11, }, .MaxMass = 255, diff --git a/src/openrct2/ride/thrill/meta/MotionSimulator.h b/src/openrct2/ride/thrill/meta/MotionSimulator.h index b70fa1488e..17079e1531 100644 --- a/src/openrct2/ride/thrill/meta/MotionSimulator.h +++ b/src/openrct2/ride/thrill/meta/MotionSimulator.h @@ -33,7 +33,7 @@ constexpr RideTypeDescriptor MotionSimulatorRTD = .DefaultMode = RideMode::FilmAvengingAviators, .Naming = { STR_RIDE_NAME_MOTION_SIMULATOR, STR_RIDE_DESCRIPTION_MOTION_SIMULATOR }, .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MOTION_SIMULATOR), + .EnumName = "RIDE_TYPE_MOTION_SIMULATOR", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 12, 64, 3, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/thrill/meta/RotoDrop.h b/src/openrct2/ride/thrill/meta/RotoDrop.h index 9d36ccfd1e..da4b0d0065 100644 --- a/src/openrct2/ride/thrill/meta/RotoDrop.h +++ b/src/openrct2/ride/thrill/meta/RotoDrop.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor RotoDropRTD = .DefaultMode = RideMode::FreefallDrop, .Naming = { STR_RIDE_NAME_ROTO_DROP, STR_RIDE_DESCRIPTION_ROTO_DROP }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_ROTO_DROP), + .EnumName = "RIDE_TYPE_ROTO_DROP", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 32, 3, 2, }, .MaxMass = 15, diff --git a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h index cdbdfb7d24..cdabad63be 100644 --- a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor SwingingInverterShipRTD = .OperatingSettings = { 7, 15 }, .Naming = { STR_RIDE_NAME_SWINGING_INVERTER_SHIP, STR_RIDE_DESCRIPTION_SWINGING_INVERTER_SHIP }, .NameConvention = { RideComponentType::Ship, RideComponentType::Structure, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_SWINGING_INVERTER_SHIP), + .EnumName = "RIDE_TYPE_SWINGING_INVERTER_SHIP", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 15, 176, 7, 11, }, .MaxMass = 255, diff --git a/src/openrct2/ride/thrill/meta/SwingingShip.h b/src/openrct2/ride/thrill/meta/SwingingShip.h index 1d1a852eec..beef48de3a 100644 --- a/src/openrct2/ride/thrill/meta/SwingingShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingShip.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor SwingingShipRTD = .OperatingSettings = { 7, 25 }, .Naming = { STR_RIDE_NAME_SWINGING_SHIP, STR_RIDE_DESCRIPTION_SWINGING_SHIP }, .NameConvention = { RideComponentType::Ship, RideComponentType::Structure, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_SWINGING_SHIP), + .EnumName = "RIDE_TYPE_SWINGING_SHIP", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 12, 112, 7, 11, }, .MaxMass = 255, diff --git a/src/openrct2/ride/thrill/meta/TopSpin.h b/src/openrct2/ride/thrill/meta/TopSpin.h index f8e98ccdba..9e65fabc9d 100644 --- a/src/openrct2/ride/thrill/meta/TopSpin.h +++ b/src/openrct2/ride/thrill/meta/TopSpin.h @@ -34,7 +34,7 @@ constexpr RideTypeDescriptor TopSpinRTD = .DefaultMode = RideMode::Beginners, .Naming = { STR_RIDE_NAME_TOP_SPIN, STR_RIDE_DESCRIPTION_TOP_SPIN }, .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_TOP_SPIN), + .EnumName = "RIDE_TYPE_TOP_SPIN", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 16, 112, 3, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/thrill/meta/Twist.h b/src/openrct2/ride/thrill/meta/Twist.h index dcc5319bcf..d9399378ca 100644 --- a/src/openrct2/ride/thrill/meta/Twist.h +++ b/src/openrct2/ride/thrill/meta/Twist.h @@ -33,7 +33,7 @@ constexpr RideTypeDescriptor TwistRTD = .OperatingSettings = { 3, 6, 3 }, .Naming = { STR_RIDE_NAME_TWIST, STR_RIDE_DESCRIPTION_TWIST }, .NameConvention = { RideComponentType::Structure, RideComponentType::Structure, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_TWIST), + .EnumName = "RIDE_TYPE_TWIST", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 12, 64, 3, 2, }, .MaxMass = 255, diff --git a/src/openrct2/ride/transport/meta/Chairlift.h b/src/openrct2/ride/transport/meta/Chairlift.h index fe99e2b73f..f875c513ca 100644 --- a/src/openrct2/ride/transport/meta/Chairlift.h +++ b/src/openrct2/ride/transport/meta/Chairlift.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor ChairliftRTD = .OperatingSettings = { 1, 4 }, .Naming = { STR_RIDE_NAME_CHAIRLIFT, STR_RIDE_DESCRIPTION_CHAIRLIFT }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_CHAIRLIFT), + .EnumName = "RIDE_TYPE_CHAIRLIFT", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 40, 32, 28, 2, }, .MaxMass = 18, diff --git a/src/openrct2/ride/transport/meta/Lift.h b/src/openrct2/ride/transport/meta/Lift.h index cd8f003e11..dab645a7e5 100644 --- a/src/openrct2/ride/transport/meta/Lift.h +++ b/src/openrct2/ride/transport/meta/Lift.h @@ -33,7 +33,7 @@ constexpr RideTypeDescriptor LiftRTD = .DefaultMode = RideMode::Shuttle, .Naming = { STR_RIDE_NAME_LIFT, STR_RIDE_DESCRIPTION_LIFT }, .NameConvention = { RideComponentType::Cabin, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_LIFT), + .EnumName = "RIDE_TYPE_LIFT", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 32, 3, 2, }, .MaxMass = 15, diff --git a/src/openrct2/ride/transport/meta/MiniatureRailway.h b/src/openrct2/ride/transport/meta/MiniatureRailway.h index 1f242cc5d7..837bf86811 100644 --- a/src/openrct2/ride/transport/meta/MiniatureRailway.h +++ b/src/openrct2/ride/transport/meta/MiniatureRailway.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor MiniatureRailwayRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_MINIATURE_RAILWAY, STR_RIDE_DESCRIPTION_MINIATURE_RAILWAY }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MINIATURE_RAILWAY), + .EnumName = "RIDE_TYPE_MINIATURE_RAILWAY", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 7, 32, 5, 9, }, .MaxMass = 39, diff --git a/src/openrct2/ride/transport/meta/Monorail.h b/src/openrct2/ride/transport/meta/Monorail.h index ddef6943fe..fe67581590 100644 --- a/src/openrct2/ride/transport/meta/Monorail.h +++ b/src/openrct2/ride/transport/meta/Monorail.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor MonorailRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_MONORAIL, STR_RIDE_DESCRIPTION_MONORAIL }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_MONORAIL), + .EnumName = "RIDE_TYPE_MONORAIL", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 8, 32, 8, 9, }, .MaxMass = 78, diff --git a/src/openrct2/ride/transport/meta/SuspendedMonorail.h b/src/openrct2/ride/transport/meta/SuspendedMonorail.h index 80424be6de..db067e8512 100644 --- a/src/openrct2/ride/transport/meta/SuspendedMonorail.h +++ b/src/openrct2/ride/transport/meta/SuspendedMonorail.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor SuspendedMonorailRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_SUSPENDED_MONORAIL, STR_RIDE_DESCRIPTION_SUSPENDED_MONORAIL }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_SUSPENDED_MONORAIL), + .EnumName = "RIDE_TYPE_SUSPENDED_MONORAIL", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 12, 40, 32, 8, }, .MaxMass = 78, diff --git a/src/openrct2/ride/water/meta/BoatHire.h b/src/openrct2/ride/water/meta/BoatHire.h index ab6f0322b5..e12c9084a3 100644 --- a/src/openrct2/ride/water/meta/BoatHire.h +++ b/src/openrct2/ride/water/meta/BoatHire.h @@ -33,7 +33,7 @@ constexpr RideTypeDescriptor BoatHireRTD = .DefaultMode = RideMode::BoatHire, .Naming = { STR_RIDE_NAME_BOAT_HIRE, STR_RIDE_DESCRIPTION_BOAT_HIRE }, .NameConvention = { RideComponentType::Boat, RideComponentType::DockingPlatform, RideComponentType::DockingPlatform }, - .EnumName = nameof(RIDE_TYPE_BOAT_HIRE), + .EnumName = "RIDE_TYPE_BOAT_HIRE", .AvailableBreakdowns = (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 16, 0, 3, }, .MaxMass = 255, diff --git a/src/openrct2/ride/water/meta/DinghySlide.h b/src/openrct2/ride/water/meta/DinghySlide.h index 491dd3989d..9fb28e97fe 100644 --- a/src/openrct2/ride/water/meta/DinghySlide.h +++ b/src/openrct2/ride/water/meta/DinghySlide.h @@ -43,7 +43,7 @@ constexpr RideTypeDescriptor DinghySlideRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_DINGHY_SLIDE, STR_RIDE_DESCRIPTION_DINGHY_SLIDE }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_DINGHY_SLIDE), + .EnumName = "RIDE_TYPE_DINGHY_SLIDE", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 15, 24, 5, 7, }, .MaxMass = 5, diff --git a/src/openrct2/ride/water/meta/LogFlume.h b/src/openrct2/ride/water/meta/LogFlume.h index 129306c08b..a33bafc499 100644 --- a/src/openrct2/ride/water/meta/LogFlume.h +++ b/src/openrct2/ride/water/meta/LogFlume.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor LogFlumeRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_LOG_FLUME, STR_RIDE_DESCRIPTION_LOG_FLUME }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_LOG_FLUME), + .EnumName = "RIDE_TYPE_LOG_FLUME", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), .Heights = { 10, 24, 7, 9, }, .MaxMass = 255, diff --git a/src/openrct2/ride/water/meta/RiverRafts.h b/src/openrct2/ride/water/meta/RiverRafts.h index 3946fc31ca..be1cb35adf 100644 --- a/src/openrct2/ride/water/meta/RiverRafts.h +++ b/src/openrct2/ride/water/meta/RiverRafts.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor RiverRaftsRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_RIVER_RAFTS, STR_RIDE_DESCRIPTION_RIVER_RAFTS }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_RIVER_RAFTS), + .EnumName = "RIDE_TYPE_RIVER_RAFTS", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 12, 24, 7, 11, }, .MaxMass = 255, diff --git a/src/openrct2/ride/water/meta/RiverRapids.h b/src/openrct2/ride/water/meta/RiverRapids.h index 964e7cd163..2f25320496 100644 --- a/src/openrct2/ride/water/meta/RiverRapids.h +++ b/src/openrct2/ride/water/meta/RiverRapids.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor RiverRapidsRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_RIVER_RAPIDS, STR_RIDE_DESCRIPTION_RIVER_RAPIDS }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_RIVER_RAPIDS), + .EnumName = "RIDE_TYPE_RIVER_RAPIDS", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), .Heights = { 9, 32, 14, 15, }, .MaxMass = 255, diff --git a/src/openrct2/ride/water/meta/SplashBoats.h b/src/openrct2/ride/water/meta/SplashBoats.h index bb1c7822cd..091def0f4f 100644 --- a/src/openrct2/ride/water/meta/SplashBoats.h +++ b/src/openrct2/ride/water/meta/SplashBoats.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor SplashBoatsRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_SPLASH_BOATS, STR_RIDE_DESCRIPTION_SPLASH_BOATS }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, - .EnumName = nameof(RIDE_TYPE_SPLASH_BOATS), + .EnumName = "RIDE_TYPE_SPLASH_BOATS", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), .Heights = { 16, 24, 7, 11, }, .MaxMass = 255, diff --git a/src/openrct2/ride/water/meta/SubmarineRide.h b/src/openrct2/ride/water/meta/SubmarineRide.h index ab9442828c..a8076e2aca 100644 --- a/src/openrct2/ride/water/meta/SubmarineRide.h +++ b/src/openrct2/ride/water/meta/SubmarineRide.h @@ -35,7 +35,7 @@ constexpr RideTypeDescriptor SubmarineRideRTD = .DefaultMode = RideMode::ContinuousCircuit, .Naming = { STR_RIDE_NAME_SUBMARINE_RIDE, STR_RIDE_DESCRIPTION_SUBMARINE_RIDE }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::DockingPlatform }, - .EnumName = nameof(RIDE_TYPE_SUBMARINE_RIDE), + .EnumName = "RIDE_TYPE_SUBMARINE_RIDE", .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 16, 0, 3, }, .MaxMass = 255, From bda7c0c0d45602073e642dd0fa5640c17526791e Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 16:09:49 +0200 Subject: [PATCH 08/13] Move datetime64 type declaration to new DateTime.h file --- src/openrct2/common.h | 9 --------- src/openrct2/core/DateTime.h | 21 +++++++++++++++++++++ src/openrct2/libopenrct2.vcxproj | 1 + src/openrct2/platform/Platform.h | 1 + src/openrct2/scenario/ScenarioRepository.h | 1 + 5 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 src/openrct2/core/DateTime.h diff --git a/src/openrct2/common.h b/src/openrct2/common.h index 52a86dcc21..0b371bd7b4 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -14,17 +14,8 @@ # define _CRT_NONSTDC_NO_WARNINGS #endif -#ifdef _MSC_VER -# include -#endif - #include "Diagnostic.h" #include #include #include - -// Time (represented as number of 100-nanosecond intervals since 0001-01-01T00:00:00Z) -using datetime64 = uint64_t; - -constexpr datetime64 DATETIME64_MIN = 0; diff --git a/src/openrct2/core/DateTime.h b/src/openrct2/core/DateTime.h new file mode 100644 index 0000000000..287c1c4a91 --- /dev/null +++ b/src/openrct2/core/DateTime.h @@ -0,0 +1,21 @@ +/***************************************************************************** + * Copyright (c) 2014-2024 OpenRCT2 developers + * + * For a complete list of all authors, please refer to contributors.md + * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is licensed under the GNU General Public License version 3. + *****************************************************************************/ + +#pragma once + +#ifdef _MSC_VER +# include +#endif + +#include + +// Time (represented as number of 100-nanosecond intervals since 0001-01-01T00:00:00Z) +using datetime64 = uint64_t; + +constexpr datetime64 DATETIME64_MIN = 0; diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index e8031f3122..3c01685fc6 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -191,6 +191,7 @@ + diff --git a/src/openrct2/platform/Platform.h b/src/openrct2/platform/Platform.h index cb3910071e..7bb22d4909 100644 --- a/src/openrct2/platform/Platform.h +++ b/src/openrct2/platform/Platform.h @@ -11,6 +11,7 @@ #include "../common.h" #include "../config/ConfigTypes.h" +#include "../core/DateTime.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/scenario/ScenarioRepository.h b/src/openrct2/scenario/ScenarioRepository.h index 7107081488..92cfab93d3 100644 --- a/src/openrct2/scenario/ScenarioRepository.h +++ b/src/openrct2/scenario/ScenarioRepository.h @@ -11,6 +11,7 @@ #pragma once #include "../common.h" +#include "../core/DateTime.h" #include "../core/String.hpp" #include "../scenario/Scenario.h" From 51873dc0f6958b55eff776f7b6bed6ce33ecabe0 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 16:23:31 +0200 Subject: [PATCH 09/13] Include Diagnostic.h at unit level --- src/openrct2-ui/Ui.cpp | 1 + src/openrct2-ui/UiContext.Android.cpp | 1 + src/openrct2-ui/UiContext.Linux.cpp | 1 + src/openrct2-ui/UiContext.Win32.cpp | 1 + src/openrct2-ui/UiContext.cpp | 1 + src/openrct2-ui/UiContext.macOS.mm | 1 + src/openrct2-ui/audio/AudioContext.cpp | 1 + src/openrct2-ui/audio/FlacAudioSource.cpp | 1 + src/openrct2-ui/audio/OggAudioSource.cpp | 1 + .../drawing/engines/HardwareDisplayDrawingEngine.cpp | 1 + src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp | 1 + src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h | 1 + src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp | 1 + src/openrct2-ui/interface/Theme.cpp | 1 + src/openrct2-ui/interface/Widget.cpp | 1 + src/openrct2-ui/title/TitleSequencePlayer.cpp | 1 + src/openrct2-ui/windows/Changelog.cpp | 1 + src/openrct2-ui/windows/EditorObjectSelection.cpp | 1 + src/openrct2-ui/windows/Error.cpp | 1 + src/openrct2-ui/windows/InstallTrack.cpp | 1 + src/openrct2-ui/windows/ObjectLoadError.cpp | 1 + src/openrct2-ui/windows/Options.cpp | 1 + src/openrct2-ui/windows/Ride.cpp | 1 + src/openrct2-ui/windows/SavePrompt.cpp | 1 + src/openrct2-ui/windows/ServerList.cpp | 1 + src/openrct2-ui/windows/TopToolbar.cpp | 1 + src/openrct2/AssetPackManager.cpp | 1 + src/openrct2/CommandLineSprite.cpp | 1 + src/openrct2/EditorObjectSelectionSession.cpp | 1 + src/openrct2/FileClassifier.cpp | 1 + src/openrct2/Game.cpp | 1 + src/openrct2/GameStateSnapshots.cpp | 1 + src/openrct2/PlatformEnvironment.cpp | 1 + src/openrct2/PlatformEnvironment.h | 1 + src/openrct2/ReplayManager.cpp | 1 + src/openrct2/actions/BalloonPressAction.cpp | 1 + src/openrct2/actions/BannerPlaceAction.cpp | 1 + src/openrct2/actions/BannerRemoveAction.cpp | 1 + src/openrct2/actions/BannerSetColourAction.cpp | 1 + src/openrct2/actions/BannerSetNameAction.cpp | 1 + src/openrct2/actions/BannerSetStyleAction.cpp | 1 + src/openrct2/actions/CheatSetAction.cpp | 1 + src/openrct2/actions/ClimateSetAction.cpp | 1 + src/openrct2/actions/FootpathAdditionPlaceAction.cpp | 1 + src/openrct2/actions/FootpathAdditionRemoveAction.cpp | 1 + src/openrct2/actions/FootpathPlaceAction.cpp | 1 + src/openrct2/actions/GameAction.cpp | 1 + src/openrct2/actions/GameSetSpeedAction.cpp | 1 + src/openrct2/actions/GuestSetFlagsAction.cpp | 1 + src/openrct2/actions/GuestSetNameAction.cpp | 1 + src/openrct2/actions/LandBuyRightsAction.cpp | 1 + src/openrct2/actions/LandSetRightsAction.cpp | 1 + src/openrct2/actions/LandSmoothAction.cpp | 1 + src/openrct2/actions/LargeSceneryPlaceAction.cpp | 1 + src/openrct2/actions/LargeSceneryRemoveAction.cpp | 1 + src/openrct2/actions/LargeScenerySetColourAction.cpp | 1 + src/openrct2/actions/MazePlaceTrackAction.cpp | 1 + src/openrct2/actions/MazeSetTrackAction.cpp | 1 + src/openrct2/actions/ParkEntranceRemoveAction.cpp | 1 + src/openrct2/actions/ParkSetDateAction.cpp | 1 + src/openrct2/actions/ParkSetEntranceFeeAction.cpp | 1 + src/openrct2/actions/ParkSetNameAction.cpp | 1 + src/openrct2/actions/ParkSetParameterAction.cpp | 1 + src/openrct2/actions/ParkSetResearchFundingAction.cpp | 1 + src/openrct2/actions/PeepPickupAction.cpp | 1 + src/openrct2/actions/RideCreateAction.cpp | 1 + src/openrct2/actions/RideDemolishAction.cpp | 1 + src/openrct2/actions/RideEntranceExitPlaceAction.cpp | 1 + src/openrct2/actions/RideEntranceExitRemoveAction.cpp | 1 + src/openrct2/actions/RideFreezeRatingAction.cpp | 2 ++ src/openrct2/actions/RideSetAppearanceAction.cpp | 1 + src/openrct2/actions/RideSetNameAction.cpp | 1 + src/openrct2/actions/RideSetPriceAction.cpp | 1 + src/openrct2/actions/RideSetSettingAction.cpp | 1 + src/openrct2/actions/RideSetStatusAction.cpp | 1 + src/openrct2/actions/RideSetVehicleAction.cpp | 1 + src/openrct2/actions/ScenarioSetSettingAction.cpp | 1 + src/openrct2/actions/SignSetStyleAction.cpp | 1 + src/openrct2/actions/SmallSceneryPlaceAction.cpp | 1 + src/openrct2/actions/SmallSceneryRemoveAction.cpp | 1 + src/openrct2/actions/SmallScenerySetColourAction.cpp | 1 + src/openrct2/actions/StaffFireAction.cpp | 1 + src/openrct2/actions/StaffHireNewAction.cpp | 1 + src/openrct2/actions/StaffSetColourAction.cpp | 1 + src/openrct2/actions/StaffSetCostumeAction.cpp | 1 + src/openrct2/actions/StaffSetNameAction.cpp | 1 + src/openrct2/actions/StaffSetOrdersAction.cpp | 1 + src/openrct2/actions/StaffSetPatrolAreaAction.cpp | 1 + src/openrct2/actions/SurfaceSetStyleAction.cpp | 1 + src/openrct2/actions/TileModifyAction.cpp | 1 + src/openrct2/actions/TrackDesignAction.cpp | 1 + src/openrct2/actions/TrackPlaceAction.cpp | 1 + src/openrct2/actions/TrackRemoveAction.cpp | 1 + src/openrct2/actions/TrackSetBrakeSpeedAction.cpp | 1 + src/openrct2/actions/WallPlaceAction.cpp | 1 + src/openrct2/actions/WallSetColourAction.cpp | 1 + src/openrct2/actions/WaterSetHeightAction.cpp | 1 + src/openrct2/common.h | 2 -- src/openrct2/config/Config.cpp | 1 + src/openrct2/core/File.cpp | 1 + src/openrct2/core/FileIndex.hpp | 1 + src/openrct2/core/FileWatcher.cpp | 2 ++ src/openrct2/core/Imaging.cpp | 1 + src/openrct2/core/Json.cpp | 1 + src/openrct2/core/RTL.FriBidi.cpp | 2 ++ src/openrct2/core/String.cpp | 2 ++ src/openrct2/core/ZipAndroid.cpp | 1 + src/openrct2/drawing/Drawing.Sprite.cpp | 1 + src/openrct2/drawing/Drawing.cpp | 1 + src/openrct2/drawing/Image.cpp | 1 + src/openrct2/drawing/LightFX.cpp | 1 + src/openrct2/drawing/TTF.cpp | 2 ++ src/openrct2/drawing/TTFSDLPort.cpp | 2 ++ src/openrct2/entity/EntityRegistry.cpp | 1 + src/openrct2/entity/Guest.cpp | 1 + src/openrct2/entity/MoneyEffect.cpp | 1 + src/openrct2/entity/Peep.cpp | 1 + src/openrct2/entity/Staff.cpp | 1 + src/openrct2/interface/Fonts.cpp | 1 + src/openrct2/interface/Screenshot.cpp | 1 + src/openrct2/interface/Viewport.cpp | 1 + src/openrct2/interface/Window.cpp | 1 + src/openrct2/localisation/LanguagePack.cpp | 1 + src/openrct2/localisation/Localisation.cpp | 1 + src/openrct2/management/NewsItem.cpp | 1 + src/openrct2/management/Research.cpp | 1 + src/openrct2/network/DiscordService.cpp | 1 + src/openrct2/network/NetworkBase.cpp | 1 + src/openrct2/network/NetworkServerAdvertiser.cpp | 1 + src/openrct2/network/ServerList.cpp | 1 + src/openrct2/network/Socket.cpp | 2 ++ src/openrct2/object/ImageTable.cpp | 1 + src/openrct2/object/Object.cpp | 1 + src/openrct2/object/ObjectFactory.cpp | 1 + src/openrct2/object/ObjectManager.cpp | 1 + src/openrct2/object/ObjectRepository.cpp | 1 + src/openrct2/paint/VirtualFloor.cpp | 1 + src/openrct2/park/ParkFile.cpp | 1 + src/openrct2/peep/GuestPathfinding.cpp | 1 + src/openrct2/platform/Platform.Android.cpp | 1 + src/openrct2/platform/Platform.Linux.cpp | 2 ++ src/openrct2/platform/Platform.Posix.cpp | 1 + src/openrct2/platform/Platform.Win32.cpp | 2 ++ src/openrct2/rct1/RCT1.h | 1 + src/openrct2/rct1/S4Importer.cpp | 1 + src/openrct2/rct1/Tables.cpp | 1 + src/openrct2/rct2/T6Exporter.cpp | 1 + src/openrct2/rct2/T6Importer.cpp | 1 + src/openrct2/ride/Ride.cpp | 1 + src/openrct2/ride/RideData.cpp | 1 + src/openrct2/ride/Track.cpp | 1 + src/openrct2/ride/TrackDesign.cpp | 1 + src/openrct2/ride/TrackDesignSave.cpp | 1 + src/openrct2/ride/TrackPaint.cpp | 1 + src/openrct2/ride/Vehicle.cpp | 1 + src/openrct2/scenario/ScenarioRepository.cpp | 1 + src/openrct2/scenario/ScenarioSources.cpp | 1 + src/openrct2/scenes/game/GameScene.cpp | 1 + src/openrct2/scenes/preloader/PreloaderScene.cpp | 1 + src/openrct2/scenes/title/TitleScene.cpp | 1 + src/openrct2/scenes/title/TitleSequence.cpp | 1 + src/openrct2/util/Util.cpp | 1 + src/openrct2/world/Banner.cpp | 1 + src/openrct2/world/Footpath.cpp | 1 + src/openrct2/world/Map.cpp | 1 + src/openrct2/world/MapAnimation.cpp | 1 + src/openrct2/world/MapGen.cpp | 1 + src/openrct2/world/TileElement.cpp | 1 + src/openrct2/world/TileInspector.cpp | 1 + test/tests/S6ImportExportTests.cpp | 1 + 170 files changed, 178 insertions(+), 2 deletions(-) diff --git a/src/openrct2-ui/Ui.cpp b/src/openrct2-ui/Ui.cpp index d083f5839d..c7fb10a1b6 100644 --- a/src/openrct2-ui/Ui.cpp +++ b/src/openrct2-ui/Ui.cpp @@ -16,6 +16,7 @@ #include #include +#include #include #include #include diff --git a/src/openrct2-ui/UiContext.Android.cpp b/src/openrct2-ui/UiContext.Android.cpp index fbbe88ce36..4d022f4d1f 100644 --- a/src/openrct2-ui/UiContext.Android.cpp +++ b/src/openrct2-ui/UiContext.Android.cpp @@ -14,6 +14,7 @@ # include # include # include +# include # include # include # include diff --git a/src/openrct2-ui/UiContext.Linux.cpp b/src/openrct2-ui/UiContext.Linux.cpp index d774d262a8..cbcb5cdea6 100644 --- a/src/openrct2-ui/UiContext.Linux.cpp +++ b/src/openrct2-ui/UiContext.Linux.cpp @@ -16,6 +16,7 @@ # include # include # include +# include # include # include # include diff --git a/src/openrct2-ui/UiContext.Win32.cpp b/src/openrct2-ui/UiContext.Win32.cpp index f2a669092a..e5ac27e073 100644 --- a/src/openrct2-ui/UiContext.Win32.cpp +++ b/src/openrct2-ui/UiContext.Win32.cpp @@ -14,6 +14,7 @@ # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif +# include # include # include // clang-format on diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp index 4cf02727ef..da6cafde24 100644 --- a/src/openrct2-ui/UiContext.cpp +++ b/src/openrct2-ui/UiContext.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/UiContext.macOS.mm b/src/openrct2-ui/UiContext.macOS.mm index 4e4b6b2744..2e0e1c33ca 100644 --- a/src/openrct2-ui/UiContext.macOS.mm +++ b/src/openrct2-ui/UiContext.macOS.mm @@ -11,6 +11,7 @@ # include "UiContext.h" +# include # include # include # include diff --git a/src/openrct2-ui/audio/AudioContext.cpp b/src/openrct2-ui/audio/AudioContext.cpp index 829fffc754..f28a4a1538 100644 --- a/src/openrct2-ui/audio/AudioContext.cpp +++ b/src/openrct2-ui/audio/AudioContext.cpp @@ -15,6 +15,7 @@ #include #include +#include #include #include #include diff --git a/src/openrct2-ui/audio/FlacAudioSource.cpp b/src/openrct2-ui/audio/FlacAudioSource.cpp index 011146b19a..7b76758fcb 100644 --- a/src/openrct2-ui/audio/FlacAudioSource.cpp +++ b/src/openrct2-ui/audio/FlacAudioSource.cpp @@ -9,6 +9,7 @@ #include "SDLAudioSource.h" +#include #include #ifndef DISABLE_FLAC diff --git a/src/openrct2-ui/audio/OggAudioSource.cpp b/src/openrct2-ui/audio/OggAudioSource.cpp index ba8918ed75..eecf887db8 100644 --- a/src/openrct2-ui/audio/OggAudioSource.cpp +++ b/src/openrct2-ui/audio/OggAudioSource.cpp @@ -9,6 +9,7 @@ #include "SDLAudioSource.h" +#include #include #ifndef DISABLE_VORBIS diff --git a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp index a75e9d9819..4491c5442f 100644 --- a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp index 7a943bce4a..931db35bc1 100644 --- a/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h b/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h index 8791fb6567..73a8406e46 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h @@ -9,6 +9,7 @@ #pragma once +#include #include #ifdef OPENGL_NO_LINK diff --git a/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp b/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp index 77e2d0eabd..414e39b3b3 100644 --- a/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp @@ -12,6 +12,7 @@ # include "TextureCache.h" # include +# include # include # include # include diff --git a/src/openrct2-ui/interface/Theme.cpp b/src/openrct2-ui/interface/Theme.cpp index 13c66211c4..78e4a04e7b 100644 --- a/src/openrct2-ui/interface/Theme.cpp +++ b/src/openrct2-ui/interface/Theme.cpp @@ -16,6 +16,7 @@ #include #include +#include #include #include #include diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index f7ca2652b5..0b60f5b6e5 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/title/TitleSequencePlayer.cpp b/src/openrct2-ui/title/TitleSequencePlayer.cpp index b342074e86..27c88c38ad 100644 --- a/src/openrct2-ui/title/TitleSequencePlayer.cpp +++ b/src/openrct2-ui/title/TitleSequencePlayer.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp index e4160c0c65..69e1393fe8 100644 --- a/src/openrct2-ui/windows/Changelog.cpp +++ b/src/openrct2-ui/windows/Changelog.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 0971266c0c..ba608f9d55 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Error.cpp b/src/openrct2-ui/windows/Error.cpp index c835b619b2..252af9c4cc 100644 --- a/src/openrct2-ui/windows/Error.cpp +++ b/src/openrct2-ui/windows/Error.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index ce5a8f1376..078ec496ac 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index 9cf689cc6c..28cd6c351c 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index e6c743b3c8..0e393c9903 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index d1a5f120cd..2f821dfc1f 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index d2344e9c2b..44d8f97a94 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 6fa38bc01a..de94ae65d4 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -14,6 +14,7 @@ # include # include # include +# include # include # include # include diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 2cf2689c76..82e2f7bf95 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2/AssetPackManager.cpp b/src/openrct2/AssetPackManager.cpp index fbdd7ed41e..e50b58a5e6 100644 --- a/src/openrct2/AssetPackManager.cpp +++ b/src/openrct2/AssetPackManager.cpp @@ -11,6 +11,7 @@ #include "AssetPack.h" #include "Context.h" +#include "Diagnostic.h" #include "PlatformEnvironment.h" #include "config/Config.h" #include "core/Console.hpp" diff --git a/src/openrct2/CommandLineSprite.cpp b/src/openrct2/CommandLineSprite.cpp index ffe578309d..104b31757b 100644 --- a/src/openrct2/CommandLineSprite.cpp +++ b/src/openrct2/CommandLineSprite.cpp @@ -10,6 +10,7 @@ #include "CommandLineSprite.h" #include "Context.h" +#include "Diagnostic.h" #include "OpenRCT2.h" #include "core/FileStream.h" #include "core/Imaging.h" diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp index 869084f587..768ab07a95 100644 --- a/src/openrct2/EditorObjectSelectionSession.cpp +++ b/src/openrct2/EditorObjectSelectionSession.cpp @@ -10,6 +10,7 @@ #include "EditorObjectSelectionSession.h" #include "Context.h" +#include "Diagnostic.h" #include "Editor.h" #include "Game.h" #include "GameState.h" diff --git a/src/openrct2/FileClassifier.cpp b/src/openrct2/FileClassifier.cpp index 37d6328a78..3b3ff5f774 100644 --- a/src/openrct2/FileClassifier.cpp +++ b/src/openrct2/FileClassifier.cpp @@ -9,6 +9,7 @@ #include "FileClassifier.h" +#include "Diagnostic.h" #include "core/Console.hpp" #include "core/FileStream.h" #include "core/Path.hpp" diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 1ec5b86167..faf6cdd31b 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -11,6 +11,7 @@ #include "Cheats.h" #include "Context.h" +#include "Diagnostic.h" #include "Editor.h" #include "FileClassifier.h" #include "GameState.h" diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index c801c52edc..39cd67d45f 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -9,6 +9,7 @@ #include "GameStateSnapshots.h" +#include "Diagnostic.h" #include "core/CircularBuffer.h" #include "entity/Balloon.h" #include "entity/Duck.h" diff --git a/src/openrct2/PlatformEnvironment.cpp b/src/openrct2/PlatformEnvironment.cpp index 9fa88c09a4..d47f1daa16 100644 --- a/src/openrct2/PlatformEnvironment.cpp +++ b/src/openrct2/PlatformEnvironment.cpp @@ -9,6 +9,7 @@ #include "PlatformEnvironment.h" +#include "Diagnostic.h" #include "OpenRCT2.h" #include "config/Config.h" #include "core/File.h" diff --git a/src/openrct2/PlatformEnvironment.h b/src/openrct2/PlatformEnvironment.h index e618943dff..9576d0fcb0 100644 --- a/src/openrct2/PlatformEnvironment.h +++ b/src/openrct2/PlatformEnvironment.h @@ -9,6 +9,7 @@ #pragma once +#include "Diagnostic.h" #include "common.h" #include "core/String.hpp" diff --git a/src/openrct2/ReplayManager.cpp b/src/openrct2/ReplayManager.cpp index 06302995e6..cb3d5f05fb 100644 --- a/src/openrct2/ReplayManager.cpp +++ b/src/openrct2/ReplayManager.cpp @@ -10,6 +10,7 @@ #include "ReplayManager.h" #include "Context.h" +#include "Diagnostic.h" #include "Game.h" #include "GameState.h" #include "GameStateSnapshots.h" diff --git a/src/openrct2/actions/BalloonPressAction.cpp b/src/openrct2/actions/BalloonPressAction.cpp index a59db7fe23..2d5b9332f3 100644 --- a/src/openrct2/actions/BalloonPressAction.cpp +++ b/src/openrct2/actions/BalloonPressAction.cpp @@ -9,6 +9,7 @@ #include "BalloonPressAction.h" +#include "../Diagnostic.h" #include "../entity/Balloon.h" #include "../entity/EntityRegistry.h" #include "GameAction.h" diff --git a/src/openrct2/actions/BannerPlaceAction.cpp b/src/openrct2/actions/BannerPlaceAction.cpp index 1e5e736392..990f943b8b 100644 --- a/src/openrct2/actions/BannerPlaceAction.cpp +++ b/src/openrct2/actions/BannerPlaceAction.cpp @@ -9,6 +9,7 @@ #include "BannerPlaceAction.h" +#include "../Diagnostic.h" #include "../management/Finance.h" #include "../object/BannerSceneryEntry.h" #include "../object/ObjectEntryManager.h" diff --git a/src/openrct2/actions/BannerRemoveAction.cpp b/src/openrct2/actions/BannerRemoveAction.cpp index 993baf955b..ab82af5784 100644 --- a/src/openrct2/actions/BannerRemoveAction.cpp +++ b/src/openrct2/actions/BannerRemoveAction.cpp @@ -9,6 +9,7 @@ #include "BannerRemoveAction.h" +#include "../Diagnostic.h" #include "../management/Finance.h" #include "../object/BannerSceneryEntry.h" #include "../object/ObjectEntryManager.h" diff --git a/src/openrct2/actions/BannerSetColourAction.cpp b/src/openrct2/actions/BannerSetColourAction.cpp index f2b210ce65..e52eab5baf 100644 --- a/src/openrct2/actions/BannerSetColourAction.cpp +++ b/src/openrct2/actions/BannerSetColourAction.cpp @@ -10,6 +10,7 @@ #include "BannerSetColourAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../management/Finance.h" #include "../windows/Intent.h" #include "../world/Banner.h" diff --git a/src/openrct2/actions/BannerSetNameAction.cpp b/src/openrct2/actions/BannerSetNameAction.cpp index a9c52faafa..91efb8aaa0 100644 --- a/src/openrct2/actions/BannerSetNameAction.cpp +++ b/src/openrct2/actions/BannerSetNameAction.cpp @@ -10,6 +10,7 @@ #include "BannerSetNameAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../core/String.hpp" #include "../drawing/Drawing.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/actions/BannerSetStyleAction.cpp b/src/openrct2/actions/BannerSetStyleAction.cpp index e86478f3ed..7239bef430 100644 --- a/src/openrct2/actions/BannerSetStyleAction.cpp +++ b/src/openrct2/actions/BannerSetStyleAction.cpp @@ -10,6 +10,7 @@ #include "BannerSetStyleAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../management/Finance.h" #include "../util/Util.h" #include "../windows/Intent.h" diff --git a/src/openrct2/actions/CheatSetAction.cpp b/src/openrct2/actions/CheatSetAction.cpp index fbfcde548d..f9fc4c78bf 100644 --- a/src/openrct2/actions/CheatSetAction.cpp +++ b/src/openrct2/actions/CheatSetAction.cpp @@ -11,6 +11,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../config/Config.h" #include "../core/String.hpp" diff --git a/src/openrct2/actions/ClimateSetAction.cpp b/src/openrct2/actions/ClimateSetAction.cpp index 09ec9a08a7..2d8ae45d77 100644 --- a/src/openrct2/actions/ClimateSetAction.cpp +++ b/src/openrct2/actions/ClimateSetAction.cpp @@ -9,6 +9,7 @@ #include "ClimateSetAction.h" +#include "../Diagnostic.h" #include "../GameState.h" ClimateSetAction::ClimateSetAction(ClimateType climate) diff --git a/src/openrct2/actions/FootpathAdditionPlaceAction.cpp b/src/openrct2/actions/FootpathAdditionPlaceAction.cpp index 0b602f9fd0..029a16c2d3 100644 --- a/src/openrct2/actions/FootpathAdditionPlaceAction.cpp +++ b/src/openrct2/actions/FootpathAdditionPlaceAction.cpp @@ -10,6 +10,7 @@ #include "FootpathAdditionPlaceAction.h" #include "../Cheats.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../core/MemoryStream.h" diff --git a/src/openrct2/actions/FootpathAdditionRemoveAction.cpp b/src/openrct2/actions/FootpathAdditionRemoveAction.cpp index 2bff554683..49fc8fbf2d 100644 --- a/src/openrct2/actions/FootpathAdditionRemoveAction.cpp +++ b/src/openrct2/actions/FootpathAdditionRemoveAction.cpp @@ -10,6 +10,7 @@ #include "FootpathAdditionRemoveAction.h" #include "../Cheats.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../core/MemoryStream.h" diff --git a/src/openrct2/actions/FootpathPlaceAction.cpp b/src/openrct2/actions/FootpathPlaceAction.cpp index b661c0b515..e64331f7e1 100644 --- a/src/openrct2/actions/FootpathPlaceAction.cpp +++ b/src/openrct2/actions/FootpathPlaceAction.cpp @@ -10,6 +10,7 @@ #include "FootpathPlaceAction.h" #include "../Cheats.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../core/MemoryStream.h" diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index 9402100080..113c21ad0c 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -10,6 +10,7 @@ #include "GameAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../ReplayManager.h" #include "../core/Guard.hpp" diff --git a/src/openrct2/actions/GameSetSpeedAction.cpp b/src/openrct2/actions/GameSetSpeedAction.cpp index 1d72b3320c..6f9ec173d4 100644 --- a/src/openrct2/actions/GameSetSpeedAction.cpp +++ b/src/openrct2/actions/GameSetSpeedAction.cpp @@ -9,6 +9,7 @@ #include "GameSetSpeedAction.h" +#include "../Diagnostic.h" #include "../config/Config.h" using namespace OpenRCT2; diff --git a/src/openrct2/actions/GuestSetFlagsAction.cpp b/src/openrct2/actions/GuestSetFlagsAction.cpp index eb70337657..5d1b117847 100644 --- a/src/openrct2/actions/GuestSetFlagsAction.cpp +++ b/src/openrct2/actions/GuestSetFlagsAction.cpp @@ -10,6 +10,7 @@ #include "GuestSetFlagsAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../OpenRCT2.h" #include "../entity/EntityRegistry.h" diff --git a/src/openrct2/actions/GuestSetNameAction.cpp b/src/openrct2/actions/GuestSetNameAction.cpp index 8532362fee..cd64bfa928 100644 --- a/src/openrct2/actions/GuestSetNameAction.cpp +++ b/src/openrct2/actions/GuestSetNameAction.cpp @@ -11,6 +11,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" #include "../entity/EntityRegistry.h" diff --git a/src/openrct2/actions/LandBuyRightsAction.cpp b/src/openrct2/actions/LandBuyRightsAction.cpp index 2d206e9dcb..bc8827a2fa 100644 --- a/src/openrct2/actions/LandBuyRightsAction.cpp +++ b/src/openrct2/actions/LandBuyRightsAction.cpp @@ -10,6 +10,7 @@ #include "LandBuyRightsAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../actions/LandSetHeightAction.h" diff --git a/src/openrct2/actions/LandSetRightsAction.cpp b/src/openrct2/actions/LandSetRightsAction.cpp index 813277a402..9c56c551e4 100644 --- a/src/openrct2/actions/LandSetRightsAction.cpp +++ b/src/openrct2/actions/LandSetRightsAction.cpp @@ -10,6 +10,7 @@ #include "LandSetRightsAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../actions/LandSetHeightAction.h" diff --git a/src/openrct2/actions/LandSmoothAction.cpp b/src/openrct2/actions/LandSmoothAction.cpp index ab608348ca..19ab9d6d80 100644 --- a/src/openrct2/actions/LandSmoothAction.cpp +++ b/src/openrct2/actions/LandSmoothAction.cpp @@ -10,6 +10,7 @@ #include "LandSmoothAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../OpenRCT2.h" #include "../actions/LandLowerAction.h" #include "../actions/LandRaiseAction.h" diff --git a/src/openrct2/actions/LargeSceneryPlaceAction.cpp b/src/openrct2/actions/LargeSceneryPlaceAction.cpp index cadc81488d..a931fd1b5b 100644 --- a/src/openrct2/actions/LargeSceneryPlaceAction.cpp +++ b/src/openrct2/actions/LargeSceneryPlaceAction.cpp @@ -9,6 +9,7 @@ #include "LargeSceneryPlaceAction.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../management/Finance.h" diff --git a/src/openrct2/actions/LargeSceneryRemoveAction.cpp b/src/openrct2/actions/LargeSceneryRemoveAction.cpp index 899a327875..3620196380 100644 --- a/src/openrct2/actions/LargeSceneryRemoveAction.cpp +++ b/src/openrct2/actions/LargeSceneryRemoveAction.cpp @@ -10,6 +10,7 @@ #include "LargeSceneryRemoveAction.h" #include "../Cheats.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../common.h" diff --git a/src/openrct2/actions/LargeScenerySetColourAction.cpp b/src/openrct2/actions/LargeScenerySetColourAction.cpp index 687a016b75..feecd7f603 100644 --- a/src/openrct2/actions/LargeScenerySetColourAction.cpp +++ b/src/openrct2/actions/LargeScenerySetColourAction.cpp @@ -9,6 +9,7 @@ #include "LargeScenerySetColourAction.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../management/Finance.h" diff --git a/src/openrct2/actions/MazePlaceTrackAction.cpp b/src/openrct2/actions/MazePlaceTrackAction.cpp index f0f4019c22..75fcdb04cf 100644 --- a/src/openrct2/actions/MazePlaceTrackAction.cpp +++ b/src/openrct2/actions/MazePlaceTrackAction.cpp @@ -8,6 +8,7 @@ *****************************************************************************/ #include "MazePlaceTrackAction.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../management/Finance.h" #include "../ride/RideData.h" diff --git a/src/openrct2/actions/MazeSetTrackAction.cpp b/src/openrct2/actions/MazeSetTrackAction.cpp index a28b73aa81..834436a13b 100644 --- a/src/openrct2/actions/MazeSetTrackAction.cpp +++ b/src/openrct2/actions/MazeSetTrackAction.cpp @@ -10,6 +10,7 @@ #include "MazeSetTrackAction.h" #include "../Cheats.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" diff --git a/src/openrct2/actions/ParkEntranceRemoveAction.cpp b/src/openrct2/actions/ParkEntranceRemoveAction.cpp index d47f15f0ef..e3a167057c 100644 --- a/src/openrct2/actions/ParkEntranceRemoveAction.cpp +++ b/src/openrct2/actions/ParkEntranceRemoveAction.cpp @@ -9,6 +9,7 @@ #include "ParkEntranceRemoveAction.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../management/Finance.h" diff --git a/src/openrct2/actions/ParkSetDateAction.cpp b/src/openrct2/actions/ParkSetDateAction.cpp index 7f82953bbb..1c50b5f51c 100644 --- a/src/openrct2/actions/ParkSetDateAction.cpp +++ b/src/openrct2/actions/ParkSetDateAction.cpp @@ -10,6 +10,7 @@ #include "ParkSetDateAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../core/MemoryStream.h" #include "../localisation/StringIds.h" diff --git a/src/openrct2/actions/ParkSetEntranceFeeAction.cpp b/src/openrct2/actions/ParkSetEntranceFeeAction.cpp index da155eb316..f34de62098 100644 --- a/src/openrct2/actions/ParkSetEntranceFeeAction.cpp +++ b/src/openrct2/actions/ParkSetEntranceFeeAction.cpp @@ -10,6 +10,7 @@ #include "ParkSetEntranceFeeAction.h" #include "../Cheats.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" diff --git a/src/openrct2/actions/ParkSetNameAction.cpp b/src/openrct2/actions/ParkSetNameAction.cpp index 57a9424a38..3573a95da8 100644 --- a/src/openrct2/actions/ParkSetNameAction.cpp +++ b/src/openrct2/actions/ParkSetNameAction.cpp @@ -10,6 +10,7 @@ #include "ParkSetNameAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" diff --git a/src/openrct2/actions/ParkSetParameterAction.cpp b/src/openrct2/actions/ParkSetParameterAction.cpp index a113238ed3..8b521afec8 100644 --- a/src/openrct2/actions/ParkSetParameterAction.cpp +++ b/src/openrct2/actions/ParkSetParameterAction.cpp @@ -9,6 +9,7 @@ #include "ParkSetParameterAction.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../interface/Window.h" #include "../ride/ShopItem.h" diff --git a/src/openrct2/actions/ParkSetResearchFundingAction.cpp b/src/openrct2/actions/ParkSetResearchFundingAction.cpp index ccb0f955eb..a4fdd06ce1 100644 --- a/src/openrct2/actions/ParkSetResearchFundingAction.cpp +++ b/src/openrct2/actions/ParkSetResearchFundingAction.cpp @@ -10,6 +10,7 @@ #include "ParkSetResearchFundingAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../core/MemoryStream.h" #include "../localisation/StringIds.h" diff --git a/src/openrct2/actions/PeepPickupAction.cpp b/src/openrct2/actions/PeepPickupAction.cpp index 3978d3ddee..5ea02f4bfb 100644 --- a/src/openrct2/actions/PeepPickupAction.cpp +++ b/src/openrct2/actions/PeepPickupAction.cpp @@ -9,6 +9,7 @@ #include "PeepPickupAction.h" +#include "../Diagnostic.h" #include "../Input.h" #include "../entity/EntityRegistry.h" #include "../entity/Peep.h" diff --git a/src/openrct2/actions/RideCreateAction.cpp b/src/openrct2/actions/RideCreateAction.cpp index 67043789ed..ef532c73bc 100644 --- a/src/openrct2/actions/RideCreateAction.cpp +++ b/src/openrct2/actions/RideCreateAction.cpp @@ -11,6 +11,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../core/Memory.hpp" #include "../core/MemoryStream.h" diff --git a/src/openrct2/actions/RideDemolishAction.cpp b/src/openrct2/actions/RideDemolishAction.cpp index 4e7e3f9ed7..b6abdb56bd 100644 --- a/src/openrct2/actions/RideDemolishAction.cpp +++ b/src/openrct2/actions/RideDemolishAction.cpp @@ -11,6 +11,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" diff --git a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp index 41190da23c..5633f64ba7 100644 --- a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp +++ b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp @@ -9,6 +9,7 @@ #include "RideEntranceExitPlaceAction.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../actions/RideEntranceExitRemoveAction.h" #include "../management/Finance.h" diff --git a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp index 232f8ccad9..7732e8c901 100644 --- a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp +++ b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp @@ -9,6 +9,7 @@ #include "RideEntranceExitRemoveAction.h" +#include "../Diagnostic.h" #include "../ride/Ride.h" #include "../ride/Station.h" #include "../world/Entrance.h" diff --git a/src/openrct2/actions/RideFreezeRatingAction.cpp b/src/openrct2/actions/RideFreezeRatingAction.cpp index db11ad4257..066d696154 100644 --- a/src/openrct2/actions/RideFreezeRatingAction.cpp +++ b/src/openrct2/actions/RideFreezeRatingAction.cpp @@ -9,6 +9,8 @@ #include "RideFreezeRatingAction.h" +#include "../Diagnostic.h" + RideFreezeRatingAction::RideFreezeRatingAction(RideId rideIndex, RideRatingType type, ride_rating value) : _rideIndex(rideIndex) , _type(type) diff --git a/src/openrct2/actions/RideSetAppearanceAction.cpp b/src/openrct2/actions/RideSetAppearanceAction.cpp index 5527c20353..54e7902888 100644 --- a/src/openrct2/actions/RideSetAppearanceAction.cpp +++ b/src/openrct2/actions/RideSetAppearanceAction.cpp @@ -11,6 +11,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" #include "../interface/Window.h" diff --git a/src/openrct2/actions/RideSetNameAction.cpp b/src/openrct2/actions/RideSetNameAction.cpp index 50117ba058..5811ee3e1d 100644 --- a/src/openrct2/actions/RideSetNameAction.cpp +++ b/src/openrct2/actions/RideSetNameAction.cpp @@ -11,6 +11,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" #include "../interface/Window.h" diff --git a/src/openrct2/actions/RideSetPriceAction.cpp b/src/openrct2/actions/RideSetPriceAction.cpp index 426a16f578..871f195e5a 100644 --- a/src/openrct2/actions/RideSetPriceAction.cpp +++ b/src/openrct2/actions/RideSetPriceAction.cpp @@ -10,6 +10,7 @@ #include "RideSetPriceAction.h" #include "../Cheats.h" +#include "../Diagnostic.h" #include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" diff --git a/src/openrct2/actions/RideSetSettingAction.cpp b/src/openrct2/actions/RideSetSettingAction.cpp index a40aca3cb6..18f14da269 100644 --- a/src/openrct2/actions/RideSetSettingAction.cpp +++ b/src/openrct2/actions/RideSetSettingAction.cpp @@ -10,6 +10,7 @@ #include "RideSetSettingAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../object/ObjectManager.h" #include "../ride/Ride.h" diff --git a/src/openrct2/actions/RideSetStatusAction.cpp b/src/openrct2/actions/RideSetStatusAction.cpp index f39cefb0c2..a395a083c1 100644 --- a/src/openrct2/actions/RideSetStatusAction.cpp +++ b/src/openrct2/actions/RideSetStatusAction.cpp @@ -10,6 +10,7 @@ #include "RideSetStatusAction.h" #include "../Cheats.h" +#include "../Diagnostic.h" #include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" diff --git a/src/openrct2/actions/RideSetVehicleAction.cpp b/src/openrct2/actions/RideSetVehicleAction.cpp index 337f0979f3..f8aa959c98 100644 --- a/src/openrct2/actions/RideSetVehicleAction.cpp +++ b/src/openrct2/actions/RideSetVehicleAction.cpp @@ -11,6 +11,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" diff --git a/src/openrct2/actions/ScenarioSetSettingAction.cpp b/src/openrct2/actions/ScenarioSetSettingAction.cpp index 0db80078e3..fccd3b6305 100644 --- a/src/openrct2/actions/ScenarioSetSettingAction.cpp +++ b/src/openrct2/actions/ScenarioSetSettingAction.cpp @@ -9,6 +9,7 @@ #include "ScenarioSetSettingAction.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../entity/Peep.h" diff --git a/src/openrct2/actions/SignSetStyleAction.cpp b/src/openrct2/actions/SignSetStyleAction.cpp index 025e3f5742..1b363db47b 100644 --- a/src/openrct2/actions/SignSetStyleAction.cpp +++ b/src/openrct2/actions/SignSetStyleAction.cpp @@ -10,6 +10,7 @@ #include "SignSetStyleAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" #include "../localisation/StringIds.h" diff --git a/src/openrct2/actions/SmallSceneryPlaceAction.cpp b/src/openrct2/actions/SmallSceneryPlaceAction.cpp index 43e7316ec1..89a601e88f 100644 --- a/src/openrct2/actions/SmallSceneryPlaceAction.cpp +++ b/src/openrct2/actions/SmallSceneryPlaceAction.cpp @@ -10,6 +10,7 @@ #include "SmallSceneryPlaceAction.h" #include "../Cheats.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../common.h" diff --git a/src/openrct2/actions/SmallSceneryRemoveAction.cpp b/src/openrct2/actions/SmallSceneryRemoveAction.cpp index 77ca81964b..ee728e0cc9 100644 --- a/src/openrct2/actions/SmallSceneryRemoveAction.cpp +++ b/src/openrct2/actions/SmallSceneryRemoveAction.cpp @@ -10,6 +10,7 @@ #include "SmallSceneryRemoveAction.h" #include "../Cheats.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../common.h" diff --git a/src/openrct2/actions/SmallScenerySetColourAction.cpp b/src/openrct2/actions/SmallScenerySetColourAction.cpp index 3832657eab..d7f7fa2730 100644 --- a/src/openrct2/actions/SmallScenerySetColourAction.cpp +++ b/src/openrct2/actions/SmallScenerySetColourAction.cpp @@ -10,6 +10,7 @@ #include "SmallScenerySetColourAction.h" #include "../Cheats.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../common.h" diff --git a/src/openrct2/actions/StaffFireAction.cpp b/src/openrct2/actions/StaffFireAction.cpp index 9cfc0dc218..3243cf5e33 100644 --- a/src/openrct2/actions/StaffFireAction.cpp +++ b/src/openrct2/actions/StaffFireAction.cpp @@ -9,6 +9,7 @@ #include "StaffFireAction.h" +#include "../Diagnostic.h" #include "../entity/EntityRegistry.h" #include "../entity/Staff.h" #include "../interface/Window.h" diff --git a/src/openrct2/actions/StaffHireNewAction.cpp b/src/openrct2/actions/StaffHireNewAction.cpp index 59b4970d05..f0984ced95 100644 --- a/src/openrct2/actions/StaffHireNewAction.cpp +++ b/src/openrct2/actions/StaffHireNewAction.cpp @@ -11,6 +11,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" diff --git a/src/openrct2/actions/StaffSetColourAction.cpp b/src/openrct2/actions/StaffSetColourAction.cpp index e88b14559b..524806774c 100644 --- a/src/openrct2/actions/StaffSetColourAction.cpp +++ b/src/openrct2/actions/StaffSetColourAction.cpp @@ -10,6 +10,7 @@ #include "StaffSetColourAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" #include "../entity/EntityList.h" diff --git a/src/openrct2/actions/StaffSetCostumeAction.cpp b/src/openrct2/actions/StaffSetCostumeAction.cpp index 72e822a6ce..c793277143 100644 --- a/src/openrct2/actions/StaffSetCostumeAction.cpp +++ b/src/openrct2/actions/StaffSetCostumeAction.cpp @@ -10,6 +10,7 @@ #include "StaffSetCostumeAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../entity/EntityRegistry.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/actions/StaffSetNameAction.cpp b/src/openrct2/actions/StaffSetNameAction.cpp index 9844f50a7b..d3846c1400 100644 --- a/src/openrct2/actions/StaffSetNameAction.cpp +++ b/src/openrct2/actions/StaffSetNameAction.cpp @@ -11,6 +11,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" #include "../entity/EntityRegistry.h" diff --git a/src/openrct2/actions/StaffSetOrdersAction.cpp b/src/openrct2/actions/StaffSetOrdersAction.cpp index 8ecac4c61d..ce928e34b1 100644 --- a/src/openrct2/actions/StaffSetOrdersAction.cpp +++ b/src/openrct2/actions/StaffSetOrdersAction.cpp @@ -10,6 +10,7 @@ #include "StaffSetOrdersAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../entity/EntityRegistry.h" #include "../entity/Staff.h" #include "../interface/Window.h" diff --git a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp index a2f235a972..967d9e7ec7 100644 --- a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp +++ b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp @@ -9,6 +9,7 @@ #include "StaffSetPatrolAreaAction.h" +#include "../Diagnostic.h" #include "../entity/EntityRegistry.h" #include "../entity/PatrolArea.h" #include "../entity/Peep.h" diff --git a/src/openrct2/actions/SurfaceSetStyleAction.cpp b/src/openrct2/actions/SurfaceSetStyleAction.cpp index a9151787e7..731c30f5d8 100644 --- a/src/openrct2/actions/SurfaceSetStyleAction.cpp +++ b/src/openrct2/actions/SurfaceSetStyleAction.cpp @@ -10,6 +10,7 @@ #include "SurfaceSetStyleAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../management/Finance.h" diff --git a/src/openrct2/actions/TileModifyAction.cpp b/src/openrct2/actions/TileModifyAction.cpp index d579a5399a..75cbc908e8 100644 --- a/src/openrct2/actions/TileModifyAction.cpp +++ b/src/openrct2/actions/TileModifyAction.cpp @@ -10,6 +10,7 @@ #include "TileModifyAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../windows/Intent.h" #include "../world/TileInspector.h" diff --git a/src/openrct2/actions/TrackDesignAction.cpp b/src/openrct2/actions/TrackDesignAction.cpp index bbb84e3e27..1b2e69078e 100644 --- a/src/openrct2/actions/TrackDesignAction.cpp +++ b/src/openrct2/actions/TrackDesignAction.cpp @@ -10,6 +10,7 @@ #include "TrackDesignAction.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../management/Finance.h" #include "../management/Research.h" diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index 2c769483fc..2b8072c1b8 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -9,6 +9,7 @@ #include "TrackPlaceAction.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../core/Numerics.hpp" #include "../management/Finance.h" diff --git a/src/openrct2/actions/TrackRemoveAction.cpp b/src/openrct2/actions/TrackRemoveAction.cpp index c294211e47..0ba5385667 100644 --- a/src/openrct2/actions/TrackRemoveAction.cpp +++ b/src/openrct2/actions/TrackRemoveAction.cpp @@ -9,6 +9,7 @@ #include "TrackRemoveAction.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../management/Finance.h" #include "../ride/RideData.h" diff --git a/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp b/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp index 1c73514dcd..d2cb71c881 100644 --- a/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp +++ b/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp @@ -9,6 +9,7 @@ #include "TrackSetBrakeSpeedAction.h" +#include "../Diagnostic.h" #include "../management/Finance.h" TrackSetBrakeSpeedAction::TrackSetBrakeSpeedAction(const CoordsXYZ& loc, track_type_t trackType, uint8_t brakeSpeed) diff --git a/src/openrct2/actions/WallPlaceAction.cpp b/src/openrct2/actions/WallPlaceAction.cpp index cb9b3f5294..26e6234f35 100644 --- a/src/openrct2/actions/WallPlaceAction.cpp +++ b/src/openrct2/actions/WallPlaceAction.cpp @@ -9,6 +9,7 @@ #include "WallPlaceAction.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../management/Finance.h" diff --git a/src/openrct2/actions/WallSetColourAction.cpp b/src/openrct2/actions/WallSetColourAction.cpp index 6754f37b0c..9c0a12579b 100644 --- a/src/openrct2/actions/WallSetColourAction.cpp +++ b/src/openrct2/actions/WallSetColourAction.cpp @@ -9,6 +9,7 @@ #include "WallSetColourAction.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../management/Finance.h" diff --git a/src/openrct2/actions/WaterSetHeightAction.cpp b/src/openrct2/actions/WaterSetHeightAction.cpp index 418f67874a..819565eb6d 100644 --- a/src/openrct2/actions/WaterSetHeightAction.cpp +++ b/src/openrct2/actions/WaterSetHeightAction.cpp @@ -9,6 +9,7 @@ #include "WaterSetHeightAction.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" #include "../management/Finance.h" diff --git a/src/openrct2/common.h b/src/openrct2/common.h index 0b371bd7b4..781150e654 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -14,8 +14,6 @@ # define _CRT_NONSTDC_NO_WARNINGS #endif -#include "Diagnostic.h" - #include #include #include diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp index b32c9ffc6c..f48cedf701 100644 --- a/src/openrct2/config/Config.cpp +++ b/src/openrct2/config/Config.cpp @@ -11,6 +11,7 @@ #include "../Context.h" #include "../Date.h" +#include "../Diagnostic.h" #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" #include "../core/Console.hpp" diff --git a/src/openrct2/core/File.cpp b/src/openrct2/core/File.cpp index ee897ea510..b666dab257 100644 --- a/src/openrct2/core/File.cpp +++ b/src/openrct2/core/File.cpp @@ -13,6 +13,7 @@ # include #endif +#include "../Diagnostic.h" #include "../platform/Platform.h" #include "../util/Util.h" #include "File.h" diff --git a/src/openrct2/core/FileIndex.hpp b/src/openrct2/core/FileIndex.hpp index c8740df75e..4934173b8c 100644 --- a/src/openrct2/core/FileIndex.hpp +++ b/src/openrct2/core/FileIndex.hpp @@ -10,6 +10,7 @@ #pragma once #include "../Context.h" +#include "../Diagnostic.h" #include "../common.h" #include "Console.hpp" #include "DataSerialiser.h" diff --git a/src/openrct2/core/FileWatcher.cpp b/src/openrct2/core/FileWatcher.cpp index b3c24db6c6..8792b91bed 100644 --- a/src/openrct2/core/FileWatcher.cpp +++ b/src/openrct2/core/FileWatcher.cpp @@ -7,6 +7,8 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ +#include "../Diagnostic.h" + #include #include #include diff --git a/src/openrct2/core/Imaging.cpp b/src/openrct2/core/Imaging.cpp index a0b3f351e8..d7912eb0ec 100644 --- a/src/openrct2/core/Imaging.cpp +++ b/src/openrct2/core/Imaging.cpp @@ -11,6 +11,7 @@ #include "Imaging.h" +#include "../Diagnostic.h" #include "../Version.h" #include "../drawing/Drawing.h" #include "FileSystem.hpp" diff --git a/src/openrct2/core/Json.cpp b/src/openrct2/core/Json.cpp index b1d28b8c23..ea5bc5c1c9 100644 --- a/src/openrct2/core/Json.cpp +++ b/src/openrct2/core/Json.cpp @@ -9,6 +9,7 @@ #include "Json.hpp" +#include "../Diagnostic.h" #include "FileStream.h" #include "Memory.hpp" #include "String.hpp" diff --git a/src/openrct2/core/RTL.FriBidi.cpp b/src/openrct2/core/RTL.FriBidi.cpp index cbbfd73a24..44b83b5b8a 100644 --- a/src/openrct2/core/RTL.FriBidi.cpp +++ b/src/openrct2/core/RTL.FriBidi.cpp @@ -10,6 +10,8 @@ #if defined(_WIN32) && defined(USE_FRIBIDI) # include "RTL.h" +# include "../Diagnostic.h" + # include extern "C" { diff --git a/src/openrct2/core/String.cpp b/src/openrct2/core/String.cpp index 1c32daf7ae..693f8e44c4 100644 --- a/src/openrct2/core/String.cpp +++ b/src/openrct2/core/String.cpp @@ -7,6 +7,8 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ +#include "../Diagnostic.h" + #include #include #include diff --git a/src/openrct2/core/ZipAndroid.cpp b/src/openrct2/core/ZipAndroid.cpp index e7ae949ecc..adfdb117ac 100644 --- a/src/openrct2/core/ZipAndroid.cpp +++ b/src/openrct2/core/ZipAndroid.cpp @@ -9,6 +9,7 @@ #ifdef __ANDROID__ +# include "../Diagnostic.h" # include "../platform/Platform.h" # include "IStream.hpp" # include "MemoryStream.h" diff --git a/src/openrct2/drawing/Drawing.Sprite.cpp b/src/openrct2/drawing/Drawing.Sprite.cpp index 4c04e5b79c..d5aa77abd5 100644 --- a/src/openrct2/drawing/Drawing.Sprite.cpp +++ b/src/openrct2/drawing/Drawing.Sprite.cpp @@ -10,6 +10,7 @@ #include "Drawing.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" #include "../config/Config.h" diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp index 6ccb4fbd57..c5042a606c 100644 --- a/src/openrct2/drawing/Drawing.cpp +++ b/src/openrct2/drawing/Drawing.cpp @@ -10,6 +10,7 @@ #include "Drawing.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/drawing/Image.cpp b/src/openrct2/drawing/Image.cpp index f1c6fa3abc..ec65717d15 100644 --- a/src/openrct2/drawing/Image.cpp +++ b/src/openrct2/drawing/Image.cpp @@ -9,6 +9,7 @@ #include "Image.h" +#include "../Diagnostic.h" #include "../OpenRCT2.h" #include "../core/Console.hpp" #include "../core/Guard.hpp" diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index de1a192ce1..321c83f114 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -9,6 +9,7 @@ #include "LightFX.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../common.h" diff --git a/src/openrct2/drawing/TTF.cpp b/src/openrct2/drawing/TTF.cpp index da19b3c52a..6b35dcd8e4 100644 --- a/src/openrct2/drawing/TTF.cpp +++ b/src/openrct2/drawing/TTF.cpp @@ -9,6 +9,8 @@ #ifndef NO_TTF +# include "../Diagnostic.h" + # include # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wdocumentation" diff --git a/src/openrct2/drawing/TTFSDLPort.cpp b/src/openrct2/drawing/TTFSDLPort.cpp index 58a02b21d3..46ca0870ce 100644 --- a/src/openrct2/drawing/TTFSDLPort.cpp +++ b/src/openrct2/drawing/TTFSDLPort.cpp @@ -35,6 +35,8 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ +# include "../Diagnostic.h" + # include # include # include diff --git a/src/openrct2/entity/EntityRegistry.cpp b/src/openrct2/entity/EntityRegistry.cpp index bacebf07f0..74ddfd02bb 100644 --- a/src/openrct2/entity/EntityRegistry.cpp +++ b/src/openrct2/entity/EntityRegistry.cpp @@ -9,6 +9,7 @@ #include "EntityRegistry.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../core/Algorithm.hpp" diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 5e4b89230e..db339d2a7a 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -10,6 +10,7 @@ #include "Guest.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/entity/MoneyEffect.cpp b/src/openrct2/entity/MoneyEffect.cpp index 8f2d60a3ca..92aeefc5b3 100644 --- a/src/openrct2/entity/MoneyEffect.cpp +++ b/src/openrct2/entity/MoneyEffect.cpp @@ -9,6 +9,7 @@ #include "MoneyEffect.h" +#include "../Diagnostic.h" #include "../OpenRCT2.h" #include "../config/Config.h" #include "../core/DataSerialiser.h" diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 485117f623..9817a3ca95 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -11,6 +11,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../Input.h" diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index 843654f770..3d17ab5263 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -10,6 +10,7 @@ #include "Staff.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../Input.h" diff --git a/src/openrct2/interface/Fonts.cpp b/src/openrct2/interface/Fonts.cpp index 75d28c21f1..b38b4699b6 100644 --- a/src/openrct2/interface/Fonts.cpp +++ b/src/openrct2/interface/Fonts.cpp @@ -9,6 +9,7 @@ #include "Fonts.h" +#include "../Diagnostic.h" #include "../config/Config.h" #include "../core/String.hpp" #include "../drawing/TTF.h" diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index ab00e2df2d..41e2e9175c 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -10,6 +10,7 @@ #include "Screenshot.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index 5d222b2975..84241a498b 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -10,6 +10,7 @@ #include "Viewport.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../Input.h" diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index cf5aa65f3f..1620637b37 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -10,6 +10,7 @@ #include "Window.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Editor.h" #include "../Game.h" #include "../GameState.h" diff --git a/src/openrct2/localisation/LanguagePack.cpp b/src/openrct2/localisation/LanguagePack.cpp index ee35870610..3d5c963d58 100644 --- a/src/openrct2/localisation/LanguagePack.cpp +++ b/src/openrct2/localisation/LanguagePack.cpp @@ -10,6 +10,7 @@ #include "LanguagePack.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../common.h" #include "../core/FileStream.h" #include "../core/Memory.hpp" diff --git a/src/openrct2/localisation/Localisation.cpp b/src/openrct2/localisation/Localisation.cpp index 8f0fc19af5..0a9175c399 100644 --- a/src/openrct2/localisation/Localisation.cpp +++ b/src/openrct2/localisation/Localisation.cpp @@ -9,6 +9,7 @@ #include "Localisation.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../common.h" #include "../config/Config.h" diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 62c0d281bc..e185c30468 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -10,6 +10,7 @@ #include "NewsItem.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../Input.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 6c75a5c863..0f546c64e0 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -10,6 +10,7 @@ #include "Research.h" #include "../Date.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/network/DiscordService.cpp b/src/openrct2/network/DiscordService.cpp index 9cc8ed98fe..3fe20186df 100644 --- a/src/openrct2/network/DiscordService.cpp +++ b/src/openrct2/network/DiscordService.cpp @@ -11,6 +11,7 @@ # include "DiscordService.h" # include "../Context.h" +# include "../Diagnostic.h" # include "../GameState.h" # include "../OpenRCT2.h" # include "../core/Console.hpp" diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index bffd695c59..f46c18fe2f 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -10,6 +10,7 @@ #include "NetworkBase.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../GameStateSnapshots.h" diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index c053b887c1..10084d7134 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -11,6 +11,7 @@ # include "NetworkServerAdvertiser.h" +# include "../Diagnostic.h" # include "../GameState.h" # include "../config/Config.h" # include "../core/Console.hpp" diff --git a/src/openrct2/network/ServerList.cpp b/src/openrct2/network/ServerList.cpp index 6127ae3bf9..7630b2d3b2 100644 --- a/src/openrct2/network/ServerList.cpp +++ b/src/openrct2/network/ServerList.cpp @@ -12,6 +12,7 @@ # include "ServerList.h" # include "../Context.h" +# include "../Diagnostic.h" # include "../PlatformEnvironment.h" # include "../config/Config.h" # include "../core/File.h" diff --git a/src/openrct2/network/Socket.cpp b/src/openrct2/network/Socket.cpp index 38e53ea275..a05b0ff846 100644 --- a/src/openrct2/network/Socket.cpp +++ b/src/openrct2/network/Socket.cpp @@ -9,6 +9,8 @@ #ifndef DISABLE_NETWORK +# include "../Diagnostic.h" + # include # include # include diff --git a/src/openrct2/object/ImageTable.cpp b/src/openrct2/object/ImageTable.cpp index 6bac572b7a..b32a167692 100644 --- a/src/openrct2/object/ImageTable.cpp +++ b/src/openrct2/object/ImageTable.cpp @@ -10,6 +10,7 @@ #include "ImageTable.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" #include "../core/File.h" diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp index ca2b46ee51..82868acaba 100644 --- a/src/openrct2/object/Object.cpp +++ b/src/openrct2/object/Object.cpp @@ -10,6 +10,7 @@ #include "Object.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../core/File.h" #include "../core/FileStream.h" #include "../core/Memory.hpp" diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp index 739cc65d22..42757eed43 100644 --- a/src/openrct2/object/ObjectFactory.cpp +++ b/src/openrct2/object/ObjectFactory.cpp @@ -10,6 +10,7 @@ #include "ObjectFactory.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" #include "../audio/audio.h" diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp index 9c0157798a..ae32f8e792 100644 --- a/src/openrct2/object/ObjectManager.cpp +++ b/src/openrct2/object/ObjectManager.cpp @@ -10,6 +10,7 @@ #include "ObjectManager.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../ParkImporter.h" #include "../audio/audio.h" #include "../core/Console.hpp" diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index 402104d41a..871f9a0405 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -10,6 +10,7 @@ #include "ObjectRepository.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" #include "../common.h" diff --git a/src/openrct2/paint/VirtualFloor.cpp b/src/openrct2/paint/VirtualFloor.cpp index 5c118a0efe..484242d44b 100644 --- a/src/openrct2/paint/VirtualFloor.cpp +++ b/src/openrct2/paint/VirtualFloor.cpp @@ -10,6 +10,7 @@ #include "VirtualFloor.h" #include "../Cheats.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../Input.h" #include "../config/Config.h" diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 1100eeb93a..c98e8e17a5 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -11,6 +11,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Editor.h" #include "../GameState.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp index 1c0540f565..f8a9edd127 100644 --- a/src/openrct2/peep/GuestPathfinding.cpp +++ b/src/openrct2/peep/GuestPathfinding.cpp @@ -9,6 +9,7 @@ #include "GuestPathfinding.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../core/Guard.hpp" #include "../entity/Guest.h" diff --git a/src/openrct2/platform/Platform.Android.cpp b/src/openrct2/platform/Platform.Android.cpp index 6a8cb9a5f5..678f91ae27 100644 --- a/src/openrct2/platform/Platform.Android.cpp +++ b/src/openrct2/platform/Platform.Android.cpp @@ -11,6 +11,7 @@ # include "Platform.h" +# include "../Diagnostic.h" # include "../core/Guard.hpp" # include "../localisation/Language.h" diff --git a/src/openrct2/platform/Platform.Linux.cpp b/src/openrct2/platform/Platform.Linux.cpp index aa79ec8d8f..5a159cbade 100644 --- a/src/openrct2/platform/Platform.Linux.cpp +++ b/src/openrct2/platform/Platform.Linux.cpp @@ -9,6 +9,8 @@ #if defined(__unix__) && !defined(__ANDROID__) && !defined(__APPLE__) +# include "../Diagnostic.h" + # include # include # include diff --git a/src/openrct2/platform/Platform.Posix.cpp b/src/openrct2/platform/Platform.Posix.cpp index 5dd3418831..01443a2b10 100644 --- a/src/openrct2/platform/Platform.Posix.cpp +++ b/src/openrct2/platform/Platform.Posix.cpp @@ -12,6 +12,7 @@ # include "Platform.h" # include "../Date.h" +# include "../Diagnostic.h" # include "../core/Memory.hpp" # include "../core/Path.hpp" # include "../util/Util.h" diff --git a/src/openrct2/platform/Platform.Win32.cpp b/src/openrct2/platform/Platform.Win32.cpp index b900549d4d..eb18553a38 100644 --- a/src/openrct2/platform/Platform.Win32.cpp +++ b/src/openrct2/platform/Platform.Win32.cpp @@ -13,6 +13,8 @@ # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif +# include "../Diagnostic.h" + # include // Then the rest diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index 4979de0695..e4cb2cc1ac 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -9,6 +9,7 @@ #pragma once +#include "../Diagnostic.h" #include "../core/FixedPoint.hpp" #include "../rct12/RCT12.h" #include "../ride/RideRatings.h" diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index ddae728685..49eeb0ff76 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -9,6 +9,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Editor.h" #include "../Game.h" #include "../GameState.h" diff --git a/src/openrct2/rct1/Tables.cpp b/src/openrct2/rct1/Tables.cpp index b54349bafe..cb9ca70424 100644 --- a/src/openrct2/rct1/Tables.cpp +++ b/src/openrct2/rct1/Tables.cpp @@ -9,6 +9,7 @@ #include "Tables.h" +#include "../Diagnostic.h" #include "../common.h" #include "../core/Guard.hpp" #include "../interface/Colour.h" diff --git a/src/openrct2/rct2/T6Exporter.cpp b/src/openrct2/rct2/T6Exporter.cpp index cd805d373a..d5d607e543 100644 --- a/src/openrct2/rct2/T6Exporter.cpp +++ b/src/openrct2/rct2/T6Exporter.cpp @@ -10,6 +10,7 @@ #include "T6Exporter.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../core/FileStream.h" #include "../core/MemoryStream.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/rct2/T6Importer.cpp b/src/openrct2/rct2/T6Importer.cpp index 35acea9233..fbc8e582e0 100644 --- a/src/openrct2/rct2/T6Importer.cpp +++ b/src/openrct2/rct2/T6Importer.cpp @@ -7,6 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ +#include "../Diagnostic.h" #include "../TrackImporter.h" #include "../core/FileStream.h" #include "../core/MemoryStream.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 0596b8894d..5393af7bbb 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -11,6 +11,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Editor.h" #include "../Game.h" #include "../GameState.h" diff --git a/src/openrct2/ride/RideData.cpp b/src/openrct2/ride/RideData.cpp index 64e35c108f..82d0b4b0cb 100644 --- a/src/openrct2/ride/RideData.cpp +++ b/src/openrct2/ride/RideData.cpp @@ -20,6 +20,7 @@ #include "RideData.h" #include "../Cheats.h" +#include "../Diagnostic.h" #include "../GameState.h" #include "../audio/audio.h" #include "../interface/Colour.h" diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index d4b6d6df4b..37ec9be0dd 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -10,6 +10,7 @@ #include "Track.h" #include "../Cheats.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../audio/audio.h" diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 970af8f1a9..5b3ce4ab17 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -11,6 +11,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index d0859d8b5e..a38cbf4603 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -8,6 +8,7 @@ *****************************************************************************/ #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../audio/audio.h" #include "../interface/Viewport.h" diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index afacfe7332..a809a86f45 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -9,6 +9,7 @@ #include "TrackPaint.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../config/Config.h" diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index f15e011765..3d7af639e2 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -10,6 +10,7 @@ #include "Vehicle.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Editor.h" #include "../Game.h" #include "../GameState.h" diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp index 573fd5f0aa..63388f7eb4 100644 --- a/src/openrct2/scenario/ScenarioRepository.cpp +++ b/src/openrct2/scenario/ScenarioRepository.cpp @@ -10,6 +10,7 @@ #include "ScenarioRepository.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../ParkImporter.h" #include "../PlatformEnvironment.h" diff --git a/src/openrct2/scenario/ScenarioSources.cpp b/src/openrct2/scenario/ScenarioSources.cpp index 2caace10eb..b5e319bc68 100644 --- a/src/openrct2/scenario/ScenarioSources.cpp +++ b/src/openrct2/scenario/ScenarioSources.cpp @@ -9,6 +9,7 @@ #include "ScenarioSources.h" +#include "../Diagnostic.h" #include "../core/Guard.hpp" #include "../core/String.hpp" #include "Scenario.h" diff --git a/src/openrct2/scenes/game/GameScene.cpp b/src/openrct2/scenes/game/GameScene.cpp index dbbf86d8ff..c3f48eec8e 100644 --- a/src/openrct2/scenes/game/GameScene.cpp +++ b/src/openrct2/scenes/game/GameScene.cpp @@ -10,6 +10,7 @@ #include "GameScene.h" #include "../../Context.h" +#include "../../Diagnostic.h" #include "../../Game.h" #include "../../GameState.h" #include "../../OpenRCT2.h" diff --git a/src/openrct2/scenes/preloader/PreloaderScene.cpp b/src/openrct2/scenes/preloader/PreloaderScene.cpp index ad520cc16c..346c52d06b 100644 --- a/src/openrct2/scenes/preloader/PreloaderScene.cpp +++ b/src/openrct2/scenes/preloader/PreloaderScene.cpp @@ -10,6 +10,7 @@ #include "PreloaderScene.h" #include "../../Context.h" +#include "../../Diagnostic.h" #include "../../Game.h" #include "../../GameState.h" #include "../../OpenRCT2.h" diff --git a/src/openrct2/scenes/title/TitleScene.cpp b/src/openrct2/scenes/title/TitleScene.cpp index 6fff90c50b..a7afb7da3b 100644 --- a/src/openrct2/scenes/title/TitleScene.cpp +++ b/src/openrct2/scenes/title/TitleScene.cpp @@ -10,6 +10,7 @@ #include "TitleScene.h" #include "../../Context.h" +#include "../../Diagnostic.h" #include "../../Game.h" #include "../../GameState.h" #include "../../Input.h" diff --git a/src/openrct2/scenes/title/TitleSequence.cpp b/src/openrct2/scenes/title/TitleSequence.cpp index a96a2e7229..ba6578eee0 100644 --- a/src/openrct2/scenes/title/TitleSequence.cpp +++ b/src/openrct2/scenes/title/TitleSequence.cpp @@ -9,6 +9,7 @@ #include "TitleSequence.h" +#include "../../Diagnostic.h" #include "../../common.h" #include "../../core/Collections.hpp" #include "../../core/Console.hpp" diff --git a/src/openrct2/util/Util.cpp b/src/openrct2/util/Util.cpp index 5344532e4b..7ff3b54fa8 100644 --- a/src/openrct2/util/Util.cpp +++ b/src/openrct2/util/Util.cpp @@ -9,6 +9,7 @@ #include "Util.h" +#include "../Diagnostic.h" #include "../common.h" #include "../core/Guard.hpp" #include "../core/Path.hpp" diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index ff93b80f59..9f5ae48928 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -10,6 +10,7 @@ #include "Banner.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../core/Memory.hpp" diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 212531fe6a..22b3f57f61 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -9,6 +9,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../Identifiers.h" diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 8df830d33f..b3f50c0ffe 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -11,6 +11,7 @@ #include "../Cheats.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../Input.h" diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp index 690c62f779..9032eebfae 100644 --- a/src/openrct2/world/MapAnimation.cpp +++ b/src/openrct2/world/MapAnimation.cpp @@ -10,6 +10,7 @@ #include "MapAnimation.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../entity/EntityList.h" diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp index f40059bc22..95d59d4a27 100644 --- a/src/openrct2/world/MapGen.cpp +++ b/src/openrct2/world/MapGen.cpp @@ -10,6 +10,7 @@ #include "MapGen.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" #include "../common.h" diff --git a/src/openrct2/world/TileElement.cpp b/src/openrct2/world/TileElement.cpp index 6838cf0f2d..5012270a53 100644 --- a/src/openrct2/world/TileElement.cpp +++ b/src/openrct2/world/TileElement.cpp @@ -9,6 +9,7 @@ #include "TileElement.h" +#include "../Diagnostic.h" #include "../core/Guard.hpp" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index 63cc0d0161..217ba1ef59 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -10,6 +10,7 @@ #include "TileInspector.h" #include "../Context.h" +#include "../Diagnostic.h" #include "../Game.h" #include "../actions/GameAction.h" #include "../common.h" diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 0c82eaf354..848077f842 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include From 8cef18cd2f5a191b585833503ef43558359da0a5 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 16:43:03 +0200 Subject: [PATCH 10/13] Include cassert as needed at unit level --- src/openrct2-ui/audio/OggAudioSource.cpp | 1 + src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp | 1 + src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp | 1 + src/openrct2-ui/drawing/engines/opengl/TextureCache.h | 1 + src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.cpp | 1 + src/openrct2-ui/input/MouseInput.cpp | 1 + src/openrct2-ui/ride/VehicleSounds.cpp | 1 + src/openrct2-ui/windows/Multiplayer.cpp | 1 + src/openrct2-ui/windows/NewRide.cpp | 1 + src/openrct2-ui/windows/Ride.cpp | 1 + src/openrct2-ui/windows/ServerList.cpp | 1 + src/openrct2/Context.cpp | 1 + src/openrct2/Editor.cpp | 1 + src/openrct2/command_line/ConvertCommand.cpp | 1 + src/openrct2/common.h | 1 - src/openrct2/core/Guard.cpp | 1 + src/openrct2/drawing/Drawing.Sprite.RLE.cpp | 1 + src/openrct2/drawing/Drawing.Sprite.cpp | 1 + src/openrct2/drawing/Drawing.cpp | 1 + src/openrct2/drawing/Drawing.h | 1 + src/openrct2/drawing/NewDrawing.cpp | 1 + src/openrct2/drawing/ScrollingText.cpp | 1 + src/openrct2/drawing/X8DrawingEngine.cpp | 1 + src/openrct2/entity/EntityRegistry.cpp | 1 + src/openrct2/entity/Guest.cpp | 1 + src/openrct2/entity/PatrolArea.cpp | 2 ++ src/openrct2/entity/Peep.cpp | 1 + src/openrct2/entity/Staff.cpp | 1 + src/openrct2/interface/Cursors.cpp | 1 + src/openrct2/interface/Window.cpp | 1 + src/openrct2/management/NewsItem.cpp | 2 ++ src/openrct2/network/NetworkBase.cpp | 1 + src/openrct2/object/Object.cpp | 1 + src/openrct2/paint/Paint.Entity.cpp | 2 ++ src/openrct2/paint/Paint.cpp | 1 + src/openrct2/paint/support/WoodenSupports.cpp | 2 ++ src/openrct2/paint/tile_element/Paint.Surface.cpp | 1 + src/openrct2/park/ParkFile.cpp | 1 + src/openrct2/peep/GuestPathfinding.cpp | 1 + src/openrct2/platform/Platform.Win32.cpp | 1 + src/openrct2/rct1/S4Importer.cpp | 1 + src/openrct2/rct1/T4Importer.cpp | 2 ++ src/openrct2/rct2/S6Importer.cpp | 2 ++ src/openrct2/ride/RideConstruction.cpp | 2 ++ src/openrct2/ride/Track.cpp | 2 ++ src/openrct2/ride/TrackDesignSave.cpp | 2 ++ src/openrct2/ride/Vehicle.cpp | 1 + src/openrct2/ride/coaster/VirginiaReel.cpp | 2 ++ src/openrct2/ride/gentle/ObservationTower.cpp | 2 ++ src/openrct2/ride/thrill/LaunchedFreefall.cpp | 2 ++ src/openrct2/ride/thrill/RotoDrop.cpp | 1 + src/openrct2/ride/water/SubmarineRide.cpp | 2 ++ src/openrct2/scripting/ScriptEngine.cpp | 1 + src/openrct2/util/SawyerCoding.cpp | 1 + src/openrct2/util/Util.cpp | 1 + src/openrct2/world/LargeScenery.cpp | 2 ++ src/openrct2/world/SmallScenery.cpp | 2 ++ 57 files changed, 71 insertions(+), 1 deletion(-) diff --git a/src/openrct2-ui/audio/OggAudioSource.cpp b/src/openrct2-ui/audio/OggAudioSource.cpp index eecf887db8..214767dd04 100644 --- a/src/openrct2-ui/audio/OggAudioSource.cpp +++ b/src/openrct2-ui/audio/OggAudioSource.cpp @@ -9,6 +9,7 @@ #include "SDLAudioSource.h" +#include #include #include diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp index a1ae93d834..88745adf7e 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp @@ -23,6 +23,7 @@ # include # include +# include # include # include # include diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp index f1845cbdfa..eba9a3fbb0 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp @@ -13,6 +13,7 @@ # include # include +# include # include # include diff --git a/src/openrct2-ui/drawing/engines/opengl/TextureCache.h b/src/openrct2-ui/drawing/engines/opengl/TextureCache.h index d4aba16a76..8b8e087e40 100644 --- a/src/openrct2-ui/drawing/engines/opengl/TextureCache.h +++ b/src/openrct2-ui/drawing/engines/opengl/TextureCache.h @@ -13,6 +13,7 @@ #include #include +#include #include #include #include diff --git a/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.cpp b/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.cpp index bd113014b2..04b40f59d3 100644 --- a/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.cpp @@ -12,6 +12,7 @@ # include "TransparencyDepth.h" # include +# include # include # include diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 83c13be951..9c5ded8472 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -9,6 +9,7 @@ #include "../UiStringIds.h" +#include #include #include #include diff --git a/src/openrct2-ui/ride/VehicleSounds.cpp b/src/openrct2-ui/ride/VehicleSounds.cpp index 7380b1448a..5b05dc43cb 100644 --- a/src/openrct2-ui/ride/VehicleSounds.cpp +++ b/src/openrct2-ui/ride/VehicleSounds.cpp @@ -3,6 +3,7 @@ #include "../interface/Viewport.h" #include "../interface/Window.h" +#include #include #include #include diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index 22fc14d829..efbd287d4b 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -7,6 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ +#include #include #include #include diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 2922e09710..ee00b61c6c 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -7,6 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ +#include #include #include #include diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 2f821dfc1f..6a40dc2011 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -10,6 +10,7 @@ #include "../UiStringIds.h" #include "../interface/Theme.h" +#include #include #include #include diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index de94ae65d4..9b3509a96e 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -9,6 +9,7 @@ #ifndef DISABLE_NETWORK +# include # include # include # include diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index be0f913ba1..b5e827e00f 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -8,6 +8,7 @@ *****************************************************************************/ #ifdef __EMSCRIPTEN__ +# include # include #endif // __EMSCRIPTEN__ diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index b1ee1b7b8b..35ed0f9ae5 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -49,6 +49,7 @@ #include "world/Scenery.h" #include +#include #include using namespace OpenRCT2; diff --git a/src/openrct2/command_line/ConvertCommand.cpp b/src/openrct2/command_line/ConvertCommand.cpp index 0adece350f..e93a5459ec 100644 --- a/src/openrct2/command_line/ConvertCommand.cpp +++ b/src/openrct2/command_line/ConvertCommand.cpp @@ -21,6 +21,7 @@ #include "../scenario/Scenario.h" #include "CommandLine.hpp" +#include #include using namespace OpenRCT2; diff --git a/src/openrct2/common.h b/src/openrct2/common.h index 781150e654..2b6b7fc03a 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -14,6 +14,5 @@ # define _CRT_NONSTDC_NO_WARNINGS #endif -#include #include #include diff --git a/src/openrct2/core/Guard.cpp b/src/openrct2/core/Guard.cpp index cf8e422eb5..844bbd03d8 100644 --- a/src/openrct2/core/Guard.cpp +++ b/src/openrct2/core/Guard.cpp @@ -8,6 +8,7 @@ *****************************************************************************/ #ifdef _WIN32 +# include # include #endif diff --git a/src/openrct2/drawing/Drawing.Sprite.RLE.cpp b/src/openrct2/drawing/Drawing.Sprite.RLE.cpp index c4baf88ffa..59f862811e 100644 --- a/src/openrct2/drawing/Drawing.Sprite.RLE.cpp +++ b/src/openrct2/drawing/Drawing.Sprite.RLE.cpp @@ -9,6 +9,7 @@ #include "Drawing.h" +#include #include template diff --git a/src/openrct2/drawing/Drawing.Sprite.cpp b/src/openrct2/drawing/Drawing.Sprite.cpp index d5aa77abd5..27106c4a03 100644 --- a/src/openrct2/drawing/Drawing.Sprite.cpp +++ b/src/openrct2/drawing/Drawing.Sprite.cpp @@ -23,6 +23,7 @@ #include "../ui/UiContext.h" #include "ScrollingText.h" +#include #include #include #include diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp index c5042a606c..206587c921 100644 --- a/src/openrct2/drawing/Drawing.cpp +++ b/src/openrct2/drawing/Drawing.cpp @@ -26,6 +26,7 @@ #include "../world/Location.hpp" #include "LightFX.h" +#include #include using namespace OpenRCT2; diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index 4c502e57c2..fd0953a3ba 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -18,6 +18,7 @@ #include "ImageId.hpp" #include "Text.h" +#include #include #include #include diff --git a/src/openrct2/drawing/NewDrawing.cpp b/src/openrct2/drawing/NewDrawing.cpp index 432e1da579..9b2468e234 100644 --- a/src/openrct2/drawing/NewDrawing.cpp +++ b/src/openrct2/drawing/NewDrawing.cpp @@ -20,6 +20,7 @@ #include "IDrawingContext.h" #include "IDrawingEngine.h" +#include #include using namespace OpenRCT2; diff --git a/src/openrct2/drawing/ScrollingText.cpp b/src/openrct2/drawing/ScrollingText.cpp index 74cbe84886..cc45fd3c69 100644 --- a/src/openrct2/drawing/ScrollingText.cpp +++ b/src/openrct2/drawing/ScrollingText.cpp @@ -21,6 +21,7 @@ #include "Drawing.h" #include "TTF.h" +#include #include using namespace OpenRCT2; diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp index bd750df6c8..4c139de5d8 100644 --- a/src/openrct2/drawing/X8DrawingEngine.cpp +++ b/src/openrct2/drawing/X8DrawingEngine.cpp @@ -24,6 +24,7 @@ #include "Weather.h" #include +#include #include using namespace OpenRCT2; diff --git a/src/openrct2/entity/EntityRegistry.cpp b/src/openrct2/entity/EntityRegistry.cpp index 74ddfd02bb..fdaf368b92 100644 --- a/src/openrct2/entity/EntityRegistry.cpp +++ b/src/openrct2/entity/EntityRegistry.cpp @@ -32,6 +32,7 @@ #include "MoneyEffect.h" #include "Particle.h" +#include #include #include #include diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index db339d2a7a..3b28323871 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -62,6 +62,7 @@ #include "Peep.h" #include "Staff.h" +#include #include #include diff --git a/src/openrct2/entity/PatrolArea.cpp b/src/openrct2/entity/PatrolArea.cpp index f7e73cee99..8230f1fc56 100644 --- a/src/openrct2/entity/PatrolArea.cpp +++ b/src/openrct2/entity/PatrolArea.cpp @@ -13,6 +13,8 @@ #include "EntityList.h" #include "Staff.h" +#include + static PatrolArea _consolidatedPatrolArea[EnumValue(StaffType::Count)]; static std::variant _patrolAreaToRender; diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 9817a3ca95..1a796e8ea1 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -59,6 +59,7 @@ #include "PatrolArea.h" #include "Staff.h" +#include #include #include #include diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index 3d17ab5263..2f98cc5088 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -48,6 +48,7 @@ #include "PatrolArea.h" #include "Peep.h" +#include #include using namespace OpenRCT2; diff --git a/src/openrct2/interface/Cursors.cpp b/src/openrct2/interface/Cursors.cpp index 562fc423c2..f4018a4a84 100644 --- a/src/openrct2/interface/Cursors.cpp +++ b/src/openrct2/interface/Cursors.cpp @@ -11,6 +11,7 @@ #include "../core/EnumMap.hpp" +#include #include namespace Cursor diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index 1620637b37..163a04e087 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -35,6 +35,7 @@ #include "Widget.h" #include "Window_internal.h" +#include #include #include #include diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index e185c30468..82f8896da4 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -31,6 +31,8 @@ #include "../windows/Intent.h" #include "../world/Location.hpp" +#include + using namespace OpenRCT2; News::Item& News::ItemQueues::Current() diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index f46c18fe2f..edef384b05 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -39,6 +39,7 @@ #include "../world/Location.hpp" #include "network.h" +#include #include #include diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp index 82868acaba..fbed23349a 100644 --- a/src/openrct2/object/Object.cpp +++ b/src/openrct2/object/Object.cpp @@ -25,6 +25,7 @@ #include "ObjectRepository.h" #include +#include #include #include diff --git a/src/openrct2/paint/Paint.Entity.cpp b/src/openrct2/paint/Paint.Entity.cpp index 3e1e074dc6..cfb86ea057 100644 --- a/src/openrct2/paint/Paint.Entity.cpp +++ b/src/openrct2/paint/Paint.Entity.cpp @@ -30,6 +30,8 @@ #include "../world/Park.h" #include "Paint.h" +#include + /** * Paint Quadrant * rct2: 0x0069E8B0 diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index 546aff8c52..890dc9009b 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -28,6 +28,7 @@ #include #include +#include using namespace OpenRCT2; diff --git a/src/openrct2/paint/support/WoodenSupports.cpp b/src/openrct2/paint/support/WoodenSupports.cpp index e51f34a974..73aebb070b 100644 --- a/src/openrct2/paint/support/WoodenSupports.cpp +++ b/src/openrct2/paint/support/WoodenSupports.cpp @@ -17,6 +17,8 @@ #include "../Paint.SessionFlags.h" #include "../Paint.h" +#include + constexpr auto kNumWoodenSupportTypes = 2; constexpr auto kNumWoodenSupportSubTypes = 6; diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp index 7908dcdf75..fb796e897f 100644 --- a/src/openrct2/paint/tile_element/Paint.Surface.cpp +++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp @@ -34,6 +34,7 @@ #include "Paint.TileElement.h" #include "Segment.h" +#include #include #include diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index c98e8e17a5..14050f231f 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -58,6 +58,7 @@ #include "../world/Scenery.h" #include "Legacy.h" +#include #include #include #include diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp index f8a9edd127..93df66f3b2 100644 --- a/src/openrct2/peep/GuestPathfinding.cpp +++ b/src/openrct2/peep/GuestPathfinding.cpp @@ -25,6 +25,7 @@ #include #include +#include #include bool gPeepPathFindIgnoreForeignQueues; diff --git a/src/openrct2/platform/Platform.Win32.cpp b/src/openrct2/platform/Platform.Win32.cpp index eb18553a38..6fb8390306 100644 --- a/src/openrct2/platform/Platform.Win32.cpp +++ b/src/openrct2/platform/Platform.Win32.cpp @@ -15,6 +15,7 @@ # endif # include "../Diagnostic.h" +# include # include // Then the rest diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 49eeb0ff76..cabdb9ec21 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -72,6 +72,7 @@ #include "RCT1.h" #include "Tables.h" +#include #include #include #include diff --git a/src/openrct2/rct1/T4Importer.cpp b/src/openrct2/rct1/T4Importer.cpp index ed18e02e54..abd286a930 100644 --- a/src/openrct2/rct1/T4Importer.cpp +++ b/src/openrct2/rct1/T4Importer.cpp @@ -21,6 +21,8 @@ #include "../ride/TrackDesign.h" #include "../ride/TrackDesignRepository.h" +#include + namespace RCT1 { /** diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 5115d05874..7b00114641 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -74,6 +74,8 @@ #include "../world/Surface.h" #include "../world/TilePointerIndex.hpp" +#include + using namespace OpenRCT2; namespace RCT2 diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index bebcb1b3ec..a8cc31c680 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -50,6 +50,8 @@ #include "TrainManager.h" #include "Vehicle.h" +#include + using namespace OpenRCT2::TrackMetaData; money64 _currentTrackPrice; diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 37ec9be0dd..8f7553b5ca 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -37,6 +37,8 @@ #include "TrackData.h" #include "TrackDesign.h" +#include + using namespace OpenRCT2; using namespace OpenRCT2::TrackMetaData; diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index a38cbf4603..c96fa2221a 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -34,6 +34,8 @@ #include "TrackDesign.h" #include "TrackDesignRepository.h" +#include + constexpr size_t TRACK_MAX_SAVED_TILE_ELEMENTS = 1500; constexpr int32_t TRACK_NEARBY_SCENERY_DISTANCE = 1; diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 3d7af639e2..b3d05214da 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -58,6 +58,7 @@ #include "VehicleData.h" #include "VehicleSubpositionData.h" +#include #include using namespace OpenRCT2; diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp index 2450a4a67d..9030a469aa 100644 --- a/src/openrct2/ride/coaster/VirginiaReel.cpp +++ b/src/openrct2/ride/coaster/VirginiaReel.cpp @@ -19,6 +19,8 @@ #include "../Vehicle.h" #include "../VehiclePaint.h" +#include + static constexpr WoodenSupportType kSupportType = WoodenSupportType::Truss; // 0x009927E6: diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp index 9b9974e8d7..0c55e1a95c 100644 --- a/src/openrct2/ride/gentle/ObservationTower.cpp +++ b/src/openrct2/ride/gentle/ObservationTower.cpp @@ -21,6 +21,8 @@ #include "../Vehicle.h" #include "../VehiclePaint.h" +#include + enum { SprObservationTowerSegmentBase = 14986, diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index 1e00aaa939..15e414dbb2 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -20,6 +20,8 @@ #include "../Vehicle.h" #include "../VehiclePaint.h" +#include + enum { SPR_LAUNCHED_FREEFALL_TOWER_BASE = 14564, diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp index e200f36225..6b479fc0aa 100644 --- a/src/openrct2/ride/thrill/RotoDrop.cpp +++ b/src/openrct2/ride/thrill/RotoDrop.cpp @@ -20,6 +20,7 @@ #include "../Vehicle.h" #include "../VehiclePaint.h" +#include #include enum diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp index 5ef0cb3a85..1e422e2c51 100644 --- a/src/openrct2/ride/water/SubmarineRide.cpp +++ b/src/openrct2/ride/water/SubmarineRide.cpp @@ -19,6 +19,8 @@ #include "../Vehicle.h" #include "../VehiclePaint.h" +#include + static constexpr MetalSupportType kSupportType = MetalSupportType::Stick; static uint32_t SubmarineVehicleGetBaseImageId(const Vehicle* vehicle, const CarEntry* carEntry, int32_t imageDirection) diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp index e8d6cee198..9e9c67ccc5 100644 --- a/src/openrct2/scripting/ScriptEngine.cpp +++ b/src/openrct2/scripting/ScriptEngine.cpp @@ -59,6 +59,7 @@ # include "bindings/world/ScTile.hpp" # include "bindings/world/ScTileElement.hpp" +# include # include # include # include diff --git a/src/openrct2/util/SawyerCoding.cpp b/src/openrct2/util/SawyerCoding.cpp index 014acd2a77..c4e222d9ef 100644 --- a/src/openrct2/util/SawyerCoding.cpp +++ b/src/openrct2/util/SawyerCoding.cpp @@ -14,6 +14,7 @@ #include "../scenario/Scenario.h" #include "Util.h" +#include #include #include diff --git a/src/openrct2/util/Util.cpp b/src/openrct2/util/Util.cpp index 7ff3b54fa8..f43d234c53 100644 --- a/src/openrct2/util/Util.cpp +++ b/src/openrct2/util/Util.cpp @@ -20,6 +20,7 @@ #include "zlib.h" #include +#include #include #include #include diff --git a/src/openrct2/world/LargeScenery.cpp b/src/openrct2/world/LargeScenery.cpp index 20a3f28f32..77ba5cdc7b 100644 --- a/src/openrct2/world/LargeScenery.cpp +++ b/src/openrct2/world/LargeScenery.cpp @@ -17,6 +17,8 @@ #include "../world/Banner.h" #include "TileElement.h" +#include + colour_t LargeSceneryElement::GetPrimaryColour() const { return Colour[0]; diff --git a/src/openrct2/world/SmallScenery.cpp b/src/openrct2/world/SmallScenery.cpp index d154a5aacf..ffef941662 100644 --- a/src/openrct2/world/SmallScenery.cpp +++ b/src/openrct2/world/SmallScenery.cpp @@ -26,6 +26,8 @@ #include "Scenery.h" #include "Surface.h" +#include + uint8_t SmallSceneryElement::GetSceneryQuadrant() const { return (this->Type & kTileElementQuadrantMask) >> 6; From b5ef2693b092c22c332ff70d75c91f042ef17e3a Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 16:45:19 +0200 Subject: [PATCH 11/13] Remove common.h include from all units --- src/openrct2-ui/CursorRepository.cpp | 1 - src/openrct2-ui/TextComposition.cpp | 1 - src/openrct2-ui/TextComposition.h | 1 - src/openrct2-ui/UiContext.Android.cpp | 1 - src/openrct2-ui/UiContext.Linux.cpp | 1 - src/openrct2-ui/UiContext.Win32.cpp | 1 - src/openrct2-ui/UiContext.h | 1 - src/openrct2-ui/UiContext.macOS.mm | 1 - src/openrct2-ui/WindowManager.h | 1 - src/openrct2-ui/audio/AudioChannel.cpp | 1 - src/openrct2-ui/audio/AudioContext.cpp | 1 - src/openrct2-ui/audio/AudioContext.h | 1 - src/openrct2-ui/audio/MemoryAudioSource.cpp | 1 - .../drawing/engines/DrawingEngineFactory.hpp | 1 - .../engines/HardwareDisplayDrawingEngine.cpp | 1 - .../drawing/engines/SoftwareDrawingEngine.cpp | 1 - .../drawing/engines/opengl/DrawCommands.h | 1 - .../drawing/engines/opengl/GLSLTypes.h | 2 -- .../drawing/engines/opengl/OpenGLAPI.h | 1 - .../engines/opengl/OpenGLFramebuffer.cpp | 1 - .../drawing/engines/opengl/OpenGLFramebuffer.h | 1 - .../engines/opengl/OpenGLShaderProgram.h | 1 - .../drawing/engines/opengl/SwapFramebuffer.h | 1 - .../drawing/engines/opengl/TextureCache.h | 1 - .../drawing/engines/opengl/TransparencyDepth.h | 2 -- src/openrct2-ui/interface/Dropdown.h | 1 - src/openrct2-ui/interface/LandTool.h | 1 - src/openrct2-ui/interface/Theme.cpp | 1 - src/openrct2-ui/interface/Theme.h | 1 - src/openrct2-ui/scripting/ScTileSelection.hpp | 1 - src/openrct2-ui/scripting/ScUi.hpp | 1 - src/openrct2-ui/scripting/ScViewport.hpp | 1 - src/openrct2-ui/scripting/ScWidget.hpp | 1 - src/openrct2-ui/scripting/ScWindow.hpp | 1 - src/openrct2-ui/title/TitleSequencePlayer.cpp | 1 - src/openrct2-ui/title/TitleSequencePlayer.h | 1 - src/openrct2-ui/windows/TileInspector.cpp | 1 - src/openrct2-ui/windows/Window.h | 1 - src/openrct2/CommandLineSprite.h | 1 - src/openrct2/Date.h | 2 -- src/openrct2/Editor.h | 1 - src/openrct2/EditorObjectSelectionSession.h | 1 - src/openrct2/FileClassifier.h | 1 - src/openrct2/Game.h | 1 - src/openrct2/GameStateSnapshots.h | 1 - src/openrct2/Identifiers.h | 1 - src/openrct2/OpenRCT2.h | 1 - src/openrct2/ParkImporter.h | 1 - src/openrct2/PlatformEnvironment.h | 1 - src/openrct2/ReplayManager.h | 2 -- src/openrct2/TrackImporter.h | 1 - src/openrct2/Version.h | 2 -- src/openrct2/actions/GameAction.h | 1 - .../actions/LargeSceneryRemoveAction.cpp | 1 - .../actions/RideSetColourSchemeAction.cpp | 1 - src/openrct2/actions/RideSetPriceAction.cpp | 1 - src/openrct2/actions/RideSetStatusAction.cpp | 1 - src/openrct2/actions/SignSetNameAction.cpp | 1 - .../actions/SmallSceneryPlaceAction.cpp | 1 - .../actions/SmallSceneryRemoveAction.cpp | 1 - .../actions/SmallScenerySetColourAction.cpp | 1 - src/openrct2/audio/AudioChannel.h | 1 - src/openrct2/audio/AudioContext.h | 1 - src/openrct2/audio/AudioSource.h | 1 - src/openrct2/audio/audio.h | 1 - src/openrct2/command_line/CommandLine.hpp | 2 -- src/openrct2/command_line/ConvertCommand.cpp | 1 - src/openrct2/common.h | 18 ------------------ src/openrct2/config/IniReader.cpp | 1 - src/openrct2/config/IniReader.hpp | 1 - src/openrct2/config/IniWriter.hpp | 1 - src/openrct2/core/ChecksumStream.h | 1 - src/openrct2/core/Collections.hpp | 1 - src/openrct2/core/Console.hpp | 1 - src/openrct2/core/Endianness.h | 2 -- src/openrct2/core/File.h | 1 - src/openrct2/core/FileIndex.hpp | 1 - src/openrct2/core/FileScanner.cpp | 2 -- src/openrct2/core/FileScanner.h | 1 - src/openrct2/core/FileStream.h | 1 - src/openrct2/core/Guard.cpp | 1 - src/openrct2/core/Http.h | 2 -- src/openrct2/core/IStream.hpp | 1 - src/openrct2/core/Imaging.h | 1 - src/openrct2/core/Json.hpp | 1 - src/openrct2/core/Memory.hpp | 1 - src/openrct2/core/MemoryStream.h | 1 - src/openrct2/core/Path.hpp | 1 - src/openrct2/core/String.hpp | 2 -- src/openrct2/core/StringBuilder.h | 1 - src/openrct2/core/StringReader.h | 1 - src/openrct2/core/Zip.h | 2 -- src/openrct2/drawing/AVX2Drawing.cpp | 1 - src/openrct2/drawing/Drawing.String.cpp | 1 - src/openrct2/drawing/Drawing.cpp | 1 - src/openrct2/drawing/Font.h | 1 - src/openrct2/drawing/IDrawingContext.h | 1 - src/openrct2/drawing/IDrawingEngine.h | 1 - src/openrct2/drawing/LightFX.cpp | 1 - src/openrct2/drawing/LightFX.h | 2 -- src/openrct2/drawing/Rect.cpp | 1 - src/openrct2/drawing/SSE41Drawing.cpp | 1 - src/openrct2/drawing/Weather.h | 2 -- src/openrct2/entity/EntityBase.h | 1 - src/openrct2/entity/EntityList.h | 1 - src/openrct2/entity/EntityRegistry.h | 1 - src/openrct2/entity/Fountain.h | 1 - src/openrct2/entity/Staff.h | 1 - src/openrct2/interface/Chat.h | 1 - src/openrct2/interface/Colour.h | 1 - src/openrct2/interface/Cursors.h | 2 -- src/openrct2/interface/InteractiveConsole.h | 1 - src/openrct2/interface/Screenshot.h | 1 - src/openrct2/interface/Window.h | 1 - src/openrct2/libopenrct2.vcxproj | 1 - src/openrct2/localisation/ConversionTables.h | 2 -- src/openrct2/localisation/Formatting.h | 1 - src/openrct2/localisation/LanguagePack.cpp | 1 - .../localisation/Localisation.Date.cpp | 1 - src/openrct2/localisation/Localisation.cpp | 1 - src/openrct2/management/Award.h | 2 -- src/openrct2/management/Marketing.h | 1 - src/openrct2/network/DiscordService.h | 1 - src/openrct2/network/NetworkConnection.h | 2 +- src/openrct2/network/NetworkGroup.h | 1 - src/openrct2/network/NetworkKey.h | 2 -- src/openrct2/network/NetworkPacket.h | 1 - src/openrct2/network/NetworkPlayer.h | 1 - src/openrct2/network/NetworkServerAdvertiser.h | 2 -- src/openrct2/network/NetworkTypes.h | 1 - src/openrct2/network/NetworkUser.h | 1 - src/openrct2/network/Socket.cpp | 2 +- src/openrct2/network/Socket.h | 2 -- src/openrct2/object/BannerSceneryEntry.h | 1 - src/openrct2/object/EntranceEntry.h | 1 - src/openrct2/object/FootpathEntry.h | 1 - src/openrct2/object/ImageTable.h | 1 - src/openrct2/object/Object.h | 1 - src/openrct2/object/ObjectFactory.h | 1 - src/openrct2/object/ObjectManager.h | 1 - src/openrct2/object/ObjectRepository.cpp | 1 - src/openrct2/object/ObjectRepository.h | 1 - src/openrct2/object/SceneryGroupEntry.h | 1 - src/openrct2/object/StringTable.h | 1 - src/openrct2/object/WaterEntry.h | 1 - src/openrct2/object/WaterObject.cpp | 1 - src/openrct2/openrct2_pch.h | 1 - src/openrct2/paint/Paint.SessionFlags.h | 2 -- src/openrct2/paint/Paint.h | 1 - src/openrct2/paint/Painter.h | 1 - src/openrct2/paint/VirtualFloor.h | 2 -- .../paint/tile_element/Paint.TileElement.h | 1 - src/openrct2/paint/tile_element/Paint.Wall.cpp | 1 - src/openrct2/peep/GuestPathfinding.h | 1 - src/openrct2/platform/Platform.Common.cpp | 1 - src/openrct2/platform/Platform.Win32.cpp | 1 - src/openrct2/platform/Platform.h | 1 - src/openrct2/rct1/Tables.cpp | 1 - src/openrct2/rct1/Tables.h | 1 - src/openrct2/rct12/RCT12.h | 1 - src/openrct2/rct12/SawyerChunk.h | 2 -- src/openrct2/rct12/SawyerChunkReader.h | 1 - src/openrct2/rct12/SawyerChunkWriter.h | 1 - src/openrct2/rct2/RCT2.h | 1 - src/openrct2/rct2/SeaDecrypt.cpp | 1 - src/openrct2/rct2/T6Exporter.h | 1 - src/openrct2/ride/Ride.cpp | 1 - src/openrct2/ride/Ride.h | 1 - src/openrct2/ride/RideConstruction.cpp | 1 - src/openrct2/ride/RideConstruction.h | 1 - src/openrct2/ride/RideData.h | 1 - src/openrct2/ride/RideRatings.h | 1 - src/openrct2/ride/ShopItem.cpp | 1 - src/openrct2/ride/ShopItem.h | 1 - src/openrct2/ride/Station.h | 1 - src/openrct2/ride/Track.h | 1 - src/openrct2/ride/TrackData.h | 1 - src/openrct2/ride/TrackDesign.h | 1 - src/openrct2/ride/TrackDesignRepository.h | 1 - src/openrct2/ride/TrackPaint.h | 1 - src/openrct2/ride/Vehicle.h | 1 - src/openrct2/ride/VehicleColour.h | 2 -- src/openrct2/ride/VehicleData.h | 2 -- src/openrct2/ride/VehiclePaint.h | 2 -- src/openrct2/ride/coaster/VirginiaReel.cpp | 1 - src/openrct2/ride/gentle/CarRide.cpp | 1 - src/openrct2/ride/gentle/MonorailCycles.cpp | 1 - src/openrct2/ride/gentle/ObservationTower.cpp | 1 - src/openrct2/ride/gentle/SpaceRings.cpp | 1 - src/openrct2/ride/thrill/Enterprise.cpp | 1 - src/openrct2/ride/thrill/GoKarts.cpp | 1 - src/openrct2/ride/thrill/LaunchedFreefall.cpp | 1 - src/openrct2/ride/thrill/RotoDrop.cpp | 1 - src/openrct2/ride/thrill/Twist.cpp | 1 - src/openrct2/ride/transport/Lift.cpp | 1 - .../ride/transport/MiniatureRailway.cpp | 1 - src/openrct2/ride/transport/Monorail.cpp | 1 - src/openrct2/ride/water/BoatHire.cpp | 1 - src/openrct2/scenario/Scenario.h | 1 - src/openrct2/scenario/ScenarioRepository.h | 1 - src/openrct2/scenario/ScenarioSources.h | 1 - src/openrct2/scenes/Scene.h | 2 -- src/openrct2/scenes/game/GameScene.h | 1 - src/openrct2/scenes/intro/IntroScene.h | 1 - src/openrct2/scenes/title/TitleScene.h | 1 - src/openrct2/scenes/title/TitleSequence.cpp | 1 - src/openrct2/scenes/title/TitleSequence.h | 1 - .../scenes/title/TitleSequenceManager.h | 2 +- .../scenes/title/TitleSequencePlayer.h | 2 -- src/openrct2/scripting/HookEngine.h | 1 - src/openrct2/scripting/ScriptEngine.h | 1 - .../scripting/bindings/entity/ScEntity.hpp | 1 - .../bindings/object/ScInstalledObject.hpp | 1 - .../scripting/bindings/object/ScObject.hpp | 1 - .../scripting/bindings/ride/ScRide.cpp | 1 - .../scripting/bindings/ride/ScRide.hpp | 1 - .../scripting/bindings/ride/ScRideStation.cpp | 1 - .../scripting/bindings/ride/ScRideStation.hpp | 1 - .../scripting/bindings/world/ScClimate.hpp | 1 - .../scripting/bindings/world/ScDate.hpp | 1 - .../scripting/bindings/world/ScMap.cpp | 1 - .../scripting/bindings/world/ScMap.hpp | 1 - .../scripting/bindings/world/ScPark.cpp | 1 - .../scripting/bindings/world/ScPark.hpp | 1 - .../scripting/bindings/world/ScParkMessage.cpp | 1 - .../scripting/bindings/world/ScParkMessage.hpp | 1 - .../scripting/bindings/world/ScResearch.cpp | 1 - .../scripting/bindings/world/ScScenario.hpp | 1 - .../scripting/bindings/world/ScTile.cpp | 1 - .../scripting/bindings/world/ScTile.hpp | 1 - .../scripting/bindings/world/ScTileElement.cpp | 1 - .../scripting/bindings/world/ScTileElement.hpp | 1 - src/openrct2/ui/UiContext.h | 1 - src/openrct2/ui/WindowManager.h | 1 - src/openrct2/util/SawyerCoding.h | 2 -- src/openrct2/util/Util.cpp | 1 - src/openrct2/windows/Intent.h | 1 - src/openrct2/world/Banner.h | 1 - src/openrct2/world/Climate.h | 1 - src/openrct2/world/ConstructionClearance.h | 1 - src/openrct2/world/Entrance.h | 1 - src/openrct2/world/Footpath.h | 1 - src/openrct2/world/LargeScenery.cpp | 1 - src/openrct2/world/Location.hpp | 1 - src/openrct2/world/Map.h | 1 - src/openrct2/world/MapGen.cpp | 1 - src/openrct2/world/MapGen.h | 1 - src/openrct2/world/MapHelpers.h | 1 - src/openrct2/world/Park.h | 1 - src/openrct2/world/Scenery.cpp | 1 - src/openrct2/world/Surface.h | 1 - src/openrct2/world/TileElement.h | 1 - src/openrct2/world/TileInspector.cpp | 1 - src/openrct2/world/TileInspector.h | 1 - src/openrct2/world/Wall.cpp | 1 - src/openrct2/world/Wall.h | 1 - 256 files changed, 3 insertions(+), 301 deletions(-) delete mode 100644 src/openrct2/common.h diff --git a/src/openrct2-ui/CursorRepository.cpp b/src/openrct2-ui/CursorRepository.cpp index eb4261faf0..3d06f1e42b 100644 --- a/src/openrct2-ui/CursorRepository.cpp +++ b/src/openrct2-ui/CursorRepository.cpp @@ -10,7 +10,6 @@ #include "CursorRepository.h" #include -#include #include #include #include diff --git a/src/openrct2-ui/TextComposition.cpp b/src/openrct2-ui/TextComposition.cpp index 1306940c0d..da08505389 100644 --- a/src/openrct2-ui/TextComposition.cpp +++ b/src/openrct2-ui/TextComposition.cpp @@ -15,7 +15,6 @@ #include #include -#include #include #include #include diff --git a/src/openrct2-ui/TextComposition.h b/src/openrct2-ui/TextComposition.h index a509c330b4..895e5e38ce 100644 --- a/src/openrct2-ui/TextComposition.h +++ b/src/openrct2-ui/TextComposition.h @@ -10,7 +10,6 @@ #pragma once #include -#include #include union SDL_Event; diff --git a/src/openrct2-ui/UiContext.Android.cpp b/src/openrct2-ui/UiContext.Android.cpp index 4d022f4d1f..0293c151a0 100644 --- a/src/openrct2-ui/UiContext.Android.cpp +++ b/src/openrct2-ui/UiContext.Android.cpp @@ -15,7 +15,6 @@ # include # include # include -# include # include # include # include diff --git a/src/openrct2-ui/UiContext.Linux.cpp b/src/openrct2-ui/UiContext.Linux.cpp index cbcb5cdea6..bf5f0158e3 100644 --- a/src/openrct2-ui/UiContext.Linux.cpp +++ b/src/openrct2-ui/UiContext.Linux.cpp @@ -17,7 +17,6 @@ # include # include # include -# include # include # include # include diff --git a/src/openrct2-ui/UiContext.Win32.cpp b/src/openrct2-ui/UiContext.Win32.cpp index e5ac27e073..317c96a200 100644 --- a/src/openrct2-ui/UiContext.Win32.cpp +++ b/src/openrct2-ui/UiContext.Win32.cpp @@ -25,7 +25,6 @@ # include # include -# include # include # include # include diff --git a/src/openrct2-ui/UiContext.h b/src/openrct2-ui/UiContext.h index 9e7bd702f7..831c80f686 100644 --- a/src/openrct2-ui/UiContext.h +++ b/src/openrct2-ui/UiContext.h @@ -10,7 +10,6 @@ #pragma once #include -#include #include #include diff --git a/src/openrct2-ui/UiContext.macOS.mm b/src/openrct2-ui/UiContext.macOS.mm index 2e0e1c33ca..f3c5f42181 100644 --- a/src/openrct2-ui/UiContext.macOS.mm +++ b/src/openrct2-ui/UiContext.macOS.mm @@ -12,7 +12,6 @@ # include "UiContext.h" # include -# include # include # include diff --git a/src/openrct2-ui/WindowManager.h b/src/openrct2-ui/WindowManager.h index db26590ffa..b0b2f4c6ad 100644 --- a/src/openrct2-ui/WindowManager.h +++ b/src/openrct2-ui/WindowManager.h @@ -10,7 +10,6 @@ #pragma once #include -#include namespace OpenRCT2::Ui { diff --git a/src/openrct2-ui/audio/AudioChannel.cpp b/src/openrct2-ui/audio/AudioChannel.cpp index 2bcb170b67..ea26da4603 100644 --- a/src/openrct2-ui/audio/AudioChannel.cpp +++ b/src/openrct2-ui/audio/AudioChannel.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include namespace OpenRCT2::Audio diff --git a/src/openrct2-ui/audio/AudioContext.cpp b/src/openrct2-ui/audio/AudioContext.cpp index f28a4a1538..32d563591b 100644 --- a/src/openrct2-ui/audio/AudioContext.cpp +++ b/src/openrct2-ui/audio/AudioContext.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include namespace OpenRCT2::Audio diff --git a/src/openrct2-ui/audio/AudioContext.h b/src/openrct2-ui/audio/AudioContext.h index 8cd7e0df7d..2febf3d346 100644 --- a/src/openrct2-ui/audio/AudioContext.h +++ b/src/openrct2-ui/audio/AudioContext.h @@ -12,7 +12,6 @@ #include #include #include -#include #include struct SDL_RWops; diff --git a/src/openrct2-ui/audio/MemoryAudioSource.cpp b/src/openrct2-ui/audio/MemoryAudioSource.cpp index 978310cdd8..f6082b4708 100644 --- a/src/openrct2-ui/audio/MemoryAudioSource.cpp +++ b/src/openrct2-ui/audio/MemoryAudioSource.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include diff --git a/src/openrct2-ui/drawing/engines/DrawingEngineFactory.hpp b/src/openrct2-ui/drawing/engines/DrawingEngineFactory.hpp index f852816c87..918785bbc0 100644 --- a/src/openrct2-ui/drawing/engines/DrawingEngineFactory.hpp +++ b/src/openrct2-ui/drawing/engines/DrawingEngineFactory.hpp @@ -10,7 +10,6 @@ #pragma once #include -#include #include namespace OpenRCT2::Ui diff --git a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp index 4491c5442f..8732944473 100644 --- a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp index 931db35bc1..3776d8d9ca 100644 --- a/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/drawing/engines/opengl/DrawCommands.h b/src/openrct2-ui/drawing/engines/opengl/DrawCommands.h index e53baea7d3..425dece2d5 100644 --- a/src/openrct2-ui/drawing/engines/opengl/DrawCommands.h +++ b/src/openrct2-ui/drawing/engines/opengl/DrawCommands.h @@ -13,7 +13,6 @@ #include "OpenGLAPI.h" #include "TextureCache.h" -#include #include namespace OpenRCT2::Ui { diff --git a/src/openrct2-ui/drawing/engines/opengl/GLSLTypes.h b/src/openrct2-ui/drawing/engines/opengl/GLSLTypes.h index 624c295550..2aef1c79e7 100644 --- a/src/openrct2-ui/drawing/engines/opengl/GLSLTypes.h +++ b/src/openrct2-ui/drawing/engines/opengl/GLSLTypes.h @@ -11,8 +11,6 @@ #include "OpenGLAPI.h" -#include - namespace OpenRCT2::Ui { #pragma pack(push, 1) diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h b/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h index 73a8406e46..185a81463d 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h @@ -10,7 +10,6 @@ #pragma once #include -#include #ifdef OPENGL_NO_LINK diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp index eba9a3fbb0..f9b458df35 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp @@ -15,7 +15,6 @@ # include # include # include -# include using namespace OpenRCT2::Ui; diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.h b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.h index 6999f997d9..11eac77ef8 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.h +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.h @@ -11,7 +11,6 @@ #include "OpenGLAPI.h" -#include #include #include diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLShaderProgram.h b/src/openrct2-ui/drawing/engines/opengl/OpenGLShaderProgram.h index 141276f7cc..e03e56a117 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLShaderProgram.h +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLShaderProgram.h @@ -12,7 +12,6 @@ #include "OpenGLAPI.h" #include -#include #include namespace OpenRCT2::Ui { diff --git a/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.h b/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.h index cfc23ded77..7f3c150554 100644 --- a/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.h +++ b/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.h @@ -13,7 +13,6 @@ #include "OpenGLAPI.h" #include "OpenGLFramebuffer.h" -#include namespace OpenRCT2::Ui { /** diff --git a/src/openrct2-ui/drawing/engines/opengl/TextureCache.h b/src/openrct2-ui/drawing/engines/opengl/TextureCache.h index 8b8e087e40..608418b91a 100644 --- a/src/openrct2-ui/drawing/engines/opengl/TextureCache.h +++ b/src/openrct2-ui/drawing/engines/opengl/TextureCache.h @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.h b/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.h index 3ae4bb017b..d43add764e 100644 --- a/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.h +++ b/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.h @@ -11,8 +11,6 @@ #include "DrawCommands.h" -#include - namespace OpenRCT2::Ui { /* diff --git a/src/openrct2-ui/interface/Dropdown.h b/src/openrct2-ui/interface/Dropdown.h index 7b79d1dc80..47133f6ee0 100644 --- a/src/openrct2-ui/interface/Dropdown.h +++ b/src/openrct2-ui/interface/Dropdown.h @@ -11,7 +11,6 @@ #include #include -#include #include #include diff --git a/src/openrct2-ui/interface/LandTool.h b/src/openrct2-ui/interface/LandTool.h index db1e3145d7..5df7d42a1e 100644 --- a/src/openrct2-ui/interface/LandTool.h +++ b/src/openrct2-ui/interface/LandTool.h @@ -10,7 +10,6 @@ #pragma once #include -#include #include constexpr uint16_t kLandToolMinimumSize = 1; diff --git a/src/openrct2-ui/interface/Theme.cpp b/src/openrct2-ui/interface/Theme.cpp index 78e4a04e7b..3ee9e3951a 100644 --- a/src/openrct2-ui/interface/Theme.cpp +++ b/src/openrct2-ui/interface/Theme.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/interface/Theme.h b/src/openrct2-ui/interface/Theme.h index 8c5bf8d6f5..963ba8c23a 100644 --- a/src/openrct2-ui/interface/Theme.h +++ b/src/openrct2-ui/interface/Theme.h @@ -9,7 +9,6 @@ #pragma once -#include #include #include diff --git a/src/openrct2-ui/scripting/ScTileSelection.hpp b/src/openrct2-ui/scripting/ScTileSelection.hpp index bae3da56d1..9be4723d6e 100644 --- a/src/openrct2-ui/scripting/ScTileSelection.hpp +++ b/src/openrct2-ui/scripting/ScTileSelection.hpp @@ -11,7 +11,6 @@ #ifdef ENABLE_SCRIPTING -# include # include # include diff --git a/src/openrct2-ui/scripting/ScUi.hpp b/src/openrct2-ui/scripting/ScUi.hpp index 2b3356de01..76aaeee54d 100644 --- a/src/openrct2-ui/scripting/ScUi.hpp +++ b/src/openrct2-ui/scripting/ScUi.hpp @@ -21,7 +21,6 @@ # include # include # include -# include # include # include # include diff --git a/src/openrct2-ui/scripting/ScViewport.hpp b/src/openrct2-ui/scripting/ScViewport.hpp index 828e9639fe..12110787e5 100644 --- a/src/openrct2-ui/scripting/ScViewport.hpp +++ b/src/openrct2-ui/scripting/ScViewport.hpp @@ -15,7 +15,6 @@ # include # include -# include # include # include # include diff --git a/src/openrct2-ui/scripting/ScWidget.hpp b/src/openrct2-ui/scripting/ScWidget.hpp index 7caabd8997..5e71b5ee8e 100644 --- a/src/openrct2-ui/scripting/ScWidget.hpp +++ b/src/openrct2-ui/scripting/ScWidget.hpp @@ -19,7 +19,6 @@ # include # include -# include # include # include # include diff --git a/src/openrct2-ui/scripting/ScWindow.hpp b/src/openrct2-ui/scripting/ScWindow.hpp index c24803b167..af4d0f2307 100644 --- a/src/openrct2-ui/scripting/ScWindow.hpp +++ b/src/openrct2-ui/scripting/ScWindow.hpp @@ -13,7 +13,6 @@ # include "ScWidget.hpp" -# include # include # include # include diff --git a/src/openrct2-ui/title/TitleSequencePlayer.cpp b/src/openrct2-ui/title/TitleSequencePlayer.cpp index 27c88c38ad..322de14941 100644 --- a/src/openrct2-ui/title/TitleSequencePlayer.cpp +++ b/src/openrct2-ui/title/TitleSequencePlayer.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/title/TitleSequencePlayer.h b/src/openrct2-ui/title/TitleSequencePlayer.h index d43fe983bd..9fd78f70e8 100644 --- a/src/openrct2-ui/title/TitleSequencePlayer.h +++ b/src/openrct2-ui/title/TitleSequencePlayer.h @@ -10,7 +10,6 @@ #pragma once #include -#include struct ITitleSequencePlayer; struct IScenarioRepository; diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index d7f92efb2a..c19ab052db 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/Window.h b/src/openrct2-ui/windows/Window.h index 66cd1e03fc..95e861019d 100644 --- a/src/openrct2-ui/windows/Window.h +++ b/src/openrct2-ui/windows/Window.h @@ -11,7 +11,6 @@ #include #include -#include #include #include #include diff --git a/src/openrct2/CommandLineSprite.h b/src/openrct2/CommandLineSprite.h index 726722ec10..a56967fdf8 100644 --- a/src/openrct2/CommandLineSprite.h +++ b/src/openrct2/CommandLineSprite.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "drawing/ImageImporter.h" int32_t CommandLineForSprite(const char** argv, int32_t argc); diff --git a/src/openrct2/Date.h b/src/openrct2/Date.h index a300d981b2..59128511fc 100644 --- a/src/openrct2/Date.h +++ b/src/openrct2/Date.h @@ -9,8 +9,6 @@ #pragma once -#include "common.h" - constexpr int32_t kMaxYear = 8192; constexpr int32_t kTicksPerMonth = 0x10000; diff --git a/src/openrct2/Editor.h b/src/openrct2/Editor.h index e10843fdb2..0d4fd571a7 100644 --- a/src/openrct2/Editor.h +++ b/src/openrct2/Editor.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "object/Object.h" struct ResultWithMessage; diff --git a/src/openrct2/EditorObjectSelectionSession.h b/src/openrct2/EditorObjectSelectionSession.h index aa05d05b03..f9235ef1f3 100644 --- a/src/openrct2/EditorObjectSelectionSession.h +++ b/src/openrct2/EditorObjectSelectionSession.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "object/Object.h" #include "util/Util.h" diff --git a/src/openrct2/FileClassifier.h b/src/openrct2/FileClassifier.h index 448f104fbe..f8edde8584 100644 --- a/src/openrct2/FileClassifier.h +++ b/src/openrct2/FileClassifier.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "core/String.hpp" enum class FileExtension diff --git a/src/openrct2/Game.h b/src/openrct2/Game.h index 876de954bc..fb6ac71fa0 100644 --- a/src/openrct2/Game.h +++ b/src/openrct2/Game.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "core/String.hpp" #include diff --git a/src/openrct2/GameStateSnapshots.h b/src/openrct2/GameStateSnapshots.h index 44614dae0a..aca9b92ec5 100644 --- a/src/openrct2/GameStateSnapshots.h +++ b/src/openrct2/GameStateSnapshots.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "core/DataSerialiser.h" #include diff --git a/src/openrct2/Identifiers.h b/src/openrct2/Identifiers.h index edf8d53522..423605851a 100644 --- a/src/openrct2/Identifiers.h +++ b/src/openrct2/Identifiers.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "core/Identifier.hpp" #include diff --git a/src/openrct2/OpenRCT2.h b/src/openrct2/OpenRCT2.h index d82315e205..25fa529c63 100644 --- a/src/openrct2/OpenRCT2.h +++ b/src/openrct2/OpenRCT2.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "core/String.hpp" #include diff --git a/src/openrct2/ParkImporter.h b/src/openrct2/ParkImporter.h index 436b54ab8c..5f41f93884 100644 --- a/src/openrct2/ParkImporter.h +++ b/src/openrct2/ParkImporter.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "core/String.hpp" #include "object/Object.h" #include "object/ObjectList.h" diff --git a/src/openrct2/PlatformEnvironment.h b/src/openrct2/PlatformEnvironment.h index 9576d0fcb0..b716da22df 100644 --- a/src/openrct2/PlatformEnvironment.h +++ b/src/openrct2/PlatformEnvironment.h @@ -10,7 +10,6 @@ #pragma once #include "Diagnostic.h" -#include "common.h" #include "core/String.hpp" #include diff --git a/src/openrct2/ReplayManager.h b/src/openrct2/ReplayManager.h index 9cfec548d6..ee5d8844d0 100644 --- a/src/openrct2/ReplayManager.h +++ b/src/openrct2/ReplayManager.h @@ -9,8 +9,6 @@ #pragma once -#include "common.h" - #include #include #include diff --git a/src/openrct2/TrackImporter.h b/src/openrct2/TrackImporter.h index b5962d8b2f..9b72c25b73 100644 --- a/src/openrct2/TrackImporter.h +++ b/src/openrct2/TrackImporter.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "core/IStream.hpp" #include "ride/TrackDesign.h" diff --git a/src/openrct2/Version.h b/src/openrct2/Version.h index 030baf0ec0..4fb96ec223 100644 --- a/src/openrct2/Version.h +++ b/src/openrct2/Version.h @@ -9,8 +9,6 @@ #pragma once -#include "common.h" - #include #define OPENRCT2_NAME "OpenRCT2" diff --git a/src/openrct2/actions/GameAction.h b/src/openrct2/actions/GameAction.h index 23f358fd86..3c3079924f 100644 --- a/src/openrct2/actions/GameAction.h +++ b/src/openrct2/actions/GameAction.h @@ -10,7 +10,6 @@ #pragma once #include "../Game.h" -#include "../common.h" #include "../core/DataSerialiser.h" #include "../core/Identifier.hpp" #include "../localisation/StringIds.h" diff --git a/src/openrct2/actions/LargeSceneryRemoveAction.cpp b/src/openrct2/actions/LargeSceneryRemoveAction.cpp index 3620196380..08be9d4613 100644 --- a/src/openrct2/actions/LargeSceneryRemoveAction.cpp +++ b/src/openrct2/actions/LargeSceneryRemoveAction.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" -#include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/actions/RideSetColourSchemeAction.cpp b/src/openrct2/actions/RideSetColourSchemeAction.cpp index d0fe301bca..339dd381c7 100644 --- a/src/openrct2/actions/RideSetColourSchemeAction.cpp +++ b/src/openrct2/actions/RideSetColourSchemeAction.cpp @@ -10,7 +10,6 @@ #include "RideSetColourSchemeAction.h" #include "../Cheats.h" -#include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/actions/RideSetPriceAction.cpp b/src/openrct2/actions/RideSetPriceAction.cpp index 871f195e5a..0e0e278c70 100644 --- a/src/openrct2/actions/RideSetPriceAction.cpp +++ b/src/openrct2/actions/RideSetPriceAction.cpp @@ -11,7 +11,6 @@ #include "../Cheats.h" #include "../Diagnostic.h" -#include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/actions/RideSetStatusAction.cpp b/src/openrct2/actions/RideSetStatusAction.cpp index a395a083c1..2c1c6db763 100644 --- a/src/openrct2/actions/RideSetStatusAction.cpp +++ b/src/openrct2/actions/RideSetStatusAction.cpp @@ -11,7 +11,6 @@ #include "../Cheats.h" #include "../Diagnostic.h" -#include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Formatter.h" diff --git a/src/openrct2/actions/SignSetNameAction.cpp b/src/openrct2/actions/SignSetNameAction.cpp index 0761bd6a06..d1adbaa793 100644 --- a/src/openrct2/actions/SignSetNameAction.cpp +++ b/src/openrct2/actions/SignSetNameAction.cpp @@ -11,7 +11,6 @@ #include "../Context.h" #include "../Diagnostic.h" -#include "../common.h" #include "../drawing/Drawing.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" diff --git a/src/openrct2/actions/SmallSceneryPlaceAction.cpp b/src/openrct2/actions/SmallSceneryPlaceAction.cpp index 89a601e88f..ca6570b8e1 100644 --- a/src/openrct2/actions/SmallSceneryPlaceAction.cpp +++ b/src/openrct2/actions/SmallSceneryPlaceAction.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" -#include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/actions/SmallSceneryRemoveAction.cpp b/src/openrct2/actions/SmallSceneryRemoveAction.cpp index ee728e0cc9..88d06061b8 100644 --- a/src/openrct2/actions/SmallSceneryRemoveAction.cpp +++ b/src/openrct2/actions/SmallSceneryRemoveAction.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" -#include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/actions/SmallScenerySetColourAction.cpp b/src/openrct2/actions/SmallScenerySetColourAction.cpp index d7f7fa2730..e1959aab79 100644 --- a/src/openrct2/actions/SmallScenerySetColourAction.cpp +++ b/src/openrct2/actions/SmallScenerySetColourAction.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" -#include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/audio/AudioChannel.h b/src/openrct2/audio/AudioChannel.h index 910158e455..cc81f4d1ed 100644 --- a/src/openrct2/audio/AudioChannel.h +++ b/src/openrct2/audio/AudioChannel.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "AudioMixer.h" namespace OpenRCT2::Audio diff --git a/src/openrct2/audio/AudioContext.h b/src/openrct2/audio/AudioContext.h index b926a0e86f..b105f7ad13 100644 --- a/src/openrct2/audio/AudioContext.h +++ b/src/openrct2/audio/AudioContext.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/IStream.hpp" #include diff --git a/src/openrct2/audio/AudioSource.h b/src/openrct2/audio/AudioSource.h index 8f684726ea..9b6705eee4 100644 --- a/src/openrct2/audio/AudioSource.h +++ b/src/openrct2/audio/AudioSource.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "AudioMixer.h" namespace OpenRCT2::Audio diff --git a/src/openrct2/audio/audio.h b/src/openrct2/audio/audio.h index 2946739e38..f151262012 100644 --- a/src/openrct2/audio/audio.h +++ b/src/openrct2/audio/audio.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../ride/RideTypes.h" #include "AudioMixer.h" diff --git a/src/openrct2/command_line/CommandLine.hpp b/src/openrct2/command_line/CommandLine.hpp index 67d1fb6088..2995d7557d 100644 --- a/src/openrct2/command_line/CommandLine.hpp +++ b/src/openrct2/command_line/CommandLine.hpp @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - /** * Class for enumerating and retrieving values for a set of command line arguments. */ diff --git a/src/openrct2/command_line/ConvertCommand.cpp b/src/openrct2/command_line/ConvertCommand.cpp index e93a5459ec..cb0d22119e 100644 --- a/src/openrct2/command_line/ConvertCommand.cpp +++ b/src/openrct2/command_line/ConvertCommand.cpp @@ -12,7 +12,6 @@ #include "../GameState.h" #include "../OpenRCT2.h" #include "../ParkImporter.h" -#include "../common.h" #include "../core/Console.hpp" #include "../core/Path.hpp" #include "../interface/Window.h" diff --git a/src/openrct2/common.h b/src/openrct2/common.h deleted file mode 100644 index 2b6b7fc03a..0000000000 --- a/src/openrct2/common.h +++ /dev/null @@ -1,18 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2014-2024 OpenRCT2 developers - * - * For a complete list of all authors, please refer to contributors.md - * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2 - * - * OpenRCT2 is licensed under the GNU General Public License version 3. - *****************************************************************************/ - -#pragma once - -// Ignore isatty warning on WIN32 -#ifndef _CRT_NONSTDC_NO_WARNINGS -# define _CRT_NONSTDC_NO_WARNINGS -#endif - -#include -#include diff --git a/src/openrct2/config/IniReader.cpp b/src/openrct2/config/IniReader.cpp index 08926ec680..e701b4a40e 100644 --- a/src/openrct2/config/IniReader.cpp +++ b/src/openrct2/config/IniReader.cpp @@ -9,7 +9,6 @@ #include "IniReader.hpp" -#include "../common.h" #include "../core/IStream.hpp" #include "../core/String.hpp" #include "../core/StringBuilder.h" diff --git a/src/openrct2/config/IniReader.hpp b/src/openrct2/config/IniReader.hpp index c96a51b4a6..38e8dccf82 100644 --- a/src/openrct2/config/IniReader.hpp +++ b/src/openrct2/config/IniReader.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/config/IniWriter.hpp b/src/openrct2/config/IniWriter.hpp index c10d4b1d4d..0de0d8aa0b 100644 --- a/src/openrct2/config/IniWriter.hpp +++ b/src/openrct2/config/IniWriter.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/core/ChecksumStream.h b/src/openrct2/core/ChecksumStream.h index cd7c2278b4..a6629a2671 100644 --- a/src/openrct2/core/ChecksumStream.h +++ b/src/openrct2/core/ChecksumStream.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "IStream.hpp" #include diff --git a/src/openrct2/core/Collections.hpp b/src/openrct2/core/Collections.hpp index f7670624fe..084626011d 100644 --- a/src/openrct2/core/Collections.hpp +++ b/src/openrct2/core/Collections.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Memory.hpp" #include "String.hpp" diff --git a/src/openrct2/core/Console.hpp b/src/openrct2/core/Console.hpp index 241cac8d50..ac146890b2 100644 --- a/src/openrct2/core/Console.hpp +++ b/src/openrct2/core/Console.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/core/Endianness.h b/src/openrct2/core/Endianness.h index 2dda33abcb..e395a45d8e 100644 --- a/src/openrct2/core/Endianness.h +++ b/src/openrct2/core/Endianness.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include #include diff --git a/src/openrct2/core/File.h b/src/openrct2/core/File.h index 7b8dc078e3..e7c748217b 100644 --- a/src/openrct2/core/File.h +++ b/src/openrct2/core/File.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/core/FileIndex.hpp b/src/openrct2/core/FileIndex.hpp index 4934173b8c..92b66b065a 100644 --- a/src/openrct2/core/FileIndex.hpp +++ b/src/openrct2/core/FileIndex.hpp @@ -11,7 +11,6 @@ #include "../Context.h" #include "../Diagnostic.h" -#include "../common.h" #include "Console.hpp" #include "DataSerialiser.h" #include "File.h" diff --git a/src/openrct2/core/FileScanner.cpp b/src/openrct2/core/FileScanner.cpp index 05af6ca7ab..9a27c99646 100644 --- a/src/openrct2/core/FileScanner.cpp +++ b/src/openrct2/core/FileScanner.cpp @@ -7,8 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../common.h" - #ifdef _WIN32 # include #endif diff --git a/src/openrct2/core/FileScanner.h b/src/openrct2/core/FileScanner.h index dab468edf9..d68e9346eb 100644 --- a/src/openrct2/core/FileScanner.h +++ b/src/openrct2/core/FileScanner.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/core/FileStream.h b/src/openrct2/core/FileStream.h index 195a0fe68c..e4a8981faf 100644 --- a/src/openrct2/core/FileStream.h +++ b/src/openrct2/core/FileStream.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "FileSystem.hpp" #include "IStream.hpp" diff --git a/src/openrct2/core/Guard.cpp b/src/openrct2/core/Guard.cpp index 844bbd03d8..8db96d80f8 100644 --- a/src/openrct2/core/Guard.cpp +++ b/src/openrct2/core/Guard.cpp @@ -13,7 +13,6 @@ #endif #include "../Version.h" -#include "../common.h" #include "Console.hpp" #include "Diagnostics.hpp" #include "Guard.hpp" diff --git a/src/openrct2/core/Http.h b/src/openrct2/core/Http.h index aab5336fd6..5c0be551f8 100644 --- a/src/openrct2/core/Http.h +++ b/src/openrct2/core/Http.h @@ -11,8 +11,6 @@ #ifndef DISABLE_HTTP -# include "../common.h" - # include # include # include diff --git a/src/openrct2/core/IStream.hpp b/src/openrct2/core/IStream.hpp index d1163d8356..3db2a154e4 100644 --- a/src/openrct2/core/IStream.hpp +++ b/src/openrct2/core/IStream.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../object/Object.h" #include "Memory.hpp" diff --git a/src/openrct2/core/Imaging.h b/src/openrct2/core/Imaging.h index fb60016cc6..99adb55e20 100644 --- a/src/openrct2/core/Imaging.h +++ b/src/openrct2/core/Imaging.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../drawing/Drawing.h" #include diff --git a/src/openrct2/core/Json.hpp b/src/openrct2/core/Json.hpp index a33fd9c79a..d97338fb75 100644 --- a/src/openrct2/core/Json.hpp +++ b/src/openrct2/core/Json.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/core/Memory.hpp b/src/openrct2/core/Memory.hpp index cf5711d5a5..e5db502599 100644 --- a/src/openrct2/core/Memory.hpp +++ b/src/openrct2/core/Memory.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Guard.hpp" #include diff --git a/src/openrct2/core/MemoryStream.h b/src/openrct2/core/MemoryStream.h index 3510be6ce9..33363a52fe 100644 --- a/src/openrct2/core/MemoryStream.h +++ b/src/openrct2/core/MemoryStream.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "IStream.hpp" #include diff --git a/src/openrct2/core/Path.hpp b/src/openrct2/core/Path.hpp index 160acba358..6cc7c0bf43 100644 --- a/src/openrct2/core/Path.hpp +++ b/src/openrct2/core/Path.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/core/String.hpp b/src/openrct2/core/String.hpp index 64c94e490e..21d47019fe 100644 --- a/src/openrct2/core/String.hpp +++ b/src/openrct2/core/String.hpp @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include #include #include diff --git a/src/openrct2/core/StringBuilder.h b/src/openrct2/core/StringBuilder.h index 4c2469f26d..2df78f2cb7 100644 --- a/src/openrct2/core/StringBuilder.h +++ b/src/openrct2/core/StringBuilder.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/core/StringReader.h b/src/openrct2/core/StringReader.h index 08d34ccc8a..b9ede8e4a2 100644 --- a/src/openrct2/core/StringReader.h +++ b/src/openrct2/core/StringReader.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" struct IStringReader diff --git a/src/openrct2/core/Zip.h b/src/openrct2/core/Zip.h index 0010a41b4a..a590a67df3 100644 --- a/src/openrct2/core/Zip.h +++ b/src/openrct2/core/Zip.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include #include #include diff --git a/src/openrct2/drawing/AVX2Drawing.cpp b/src/openrct2/drawing/AVX2Drawing.cpp index e6de48d4dc..39b2d1e55b 100644 --- a/src/openrct2/drawing/AVX2Drawing.cpp +++ b/src/openrct2/drawing/AVX2Drawing.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../common.h" #include "../core/Guard.hpp" #include "Drawing.h" diff --git a/src/openrct2/drawing/Drawing.String.cpp b/src/openrct2/drawing/Drawing.String.cpp index 583e7b7bd8..3fb1cc6284 100644 --- a/src/openrct2/drawing/Drawing.String.cpp +++ b/src/openrct2/drawing/Drawing.String.cpp @@ -8,7 +8,6 @@ *****************************************************************************/ #include "../Context.h" -#include "../common.h" #include "../config/Config.h" #include "../core/String.hpp" #include "../core/UTF8.h" diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp index 206587c921..e1e0f20e43 100644 --- a/src/openrct2/drawing/Drawing.cpp +++ b/src/openrct2/drawing/Drawing.cpp @@ -14,7 +14,6 @@ #include "../Game.h" #include "../GameState.h" #include "../OpenRCT2.h" -#include "../common.h" #include "../config/Config.h" #include "../core/Guard.hpp" #include "../object/Object.h" diff --git a/src/openrct2/drawing/Font.h b/src/openrct2/drawing/Font.h index b264895047..ee53a76623 100644 --- a/src/openrct2/drawing/Font.h +++ b/src/openrct2/drawing/Font.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include "../drawing/ImageId.hpp" diff --git a/src/openrct2/drawing/IDrawingContext.h b/src/openrct2/drawing/IDrawingContext.h index e918ef2a47..0efe8df7df 100644 --- a/src/openrct2/drawing/IDrawingContext.h +++ b/src/openrct2/drawing/IDrawingContext.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Drawing.h" #include "TTF.h" diff --git a/src/openrct2/drawing/IDrawingEngine.h b/src/openrct2/drawing/IDrawingEngine.h index 2f42735919..3f8751af56 100644 --- a/src/openrct2/drawing/IDrawingEngine.h +++ b/src/openrct2/drawing/IDrawingEngine.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "./Weather.h" #include diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index 321c83f114..a563b96b5a 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -12,7 +12,6 @@ #include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" -#include "../common.h" #include "../config/Config.h" #include "../entity/EntityRegistry.h" #include "../interface/Viewport.h" diff --git a/src/openrct2/drawing/LightFX.h b/src/openrct2/drawing/LightFX.h index 48eb01d57c..146445cf75 100644 --- a/src/openrct2/drawing/LightFX.h +++ b/src/openrct2/drawing/LightFX.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - struct CoordsXY; struct Vehicle; struct DrawPixelInfo; diff --git a/src/openrct2/drawing/Rect.cpp b/src/openrct2/drawing/Rect.cpp index 501e9fde68..57a191ffae 100644 --- a/src/openrct2/drawing/Rect.cpp +++ b/src/openrct2/drawing/Rect.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../common.h" #include "../interface/Colour.h" #include "../world/Location.hpp" #include "Drawing.h" diff --git a/src/openrct2/drawing/SSE41Drawing.cpp b/src/openrct2/drawing/SSE41Drawing.cpp index 65552a95f9..3276634b1c 100644 --- a/src/openrct2/drawing/SSE41Drawing.cpp +++ b/src/openrct2/drawing/SSE41Drawing.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../common.h" #include "../core/Guard.hpp" #include "Drawing.h" diff --git a/src/openrct2/drawing/Weather.h b/src/openrct2/drawing/Weather.h index 692c4ae5f8..011635925b 100644 --- a/src/openrct2/drawing/Weather.h +++ b/src/openrct2/drawing/Weather.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - struct DrawPixelInfo; namespace OpenRCT2::Drawing diff --git a/src/openrct2/entity/EntityBase.h b/src/openrct2/entity/EntityBase.h index 89ba30b514..9c43108192 100644 --- a/src/openrct2/entity/EntityBase.h +++ b/src/openrct2/entity/EntityBase.h @@ -1,7 +1,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../world/Location.hpp" enum class EntityType : uint8_t diff --git a/src/openrct2/entity/EntityList.h b/src/openrct2/entity/EntityList.h index 4e65795a6e..e0368d507b 100644 --- a/src/openrct2/entity/EntityList.h +++ b/src/openrct2/entity/EntityList.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../rct12/RCT12.h" #include "../world/Location.hpp" #include "EntityBase.h" diff --git a/src/openrct2/entity/EntityRegistry.h b/src/openrct2/entity/EntityRegistry.h index e17c08be8f..68affac7e7 100644 --- a/src/openrct2/entity/EntityRegistry.h +++ b/src/openrct2/entity/EntityRegistry.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "EntityBase.h" #include diff --git a/src/openrct2/entity/Fountain.h b/src/openrct2/entity/Fountain.h index 02b1a06e48..dc44252ce0 100644 --- a/src/openrct2/entity/Fountain.h +++ b/src/openrct2/entity/Fountain.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../world/Map.h" #include "EntityBase.h" diff --git a/src/openrct2/entity/Staff.h b/src/openrct2/entity/Staff.h index 871dafc993..92daf85551 100644 --- a/src/openrct2/entity/Staff.h +++ b/src/openrct2/entity/Staff.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../world/Map.h" #include "Peep.h" diff --git a/src/openrct2/interface/Chat.h b/src/openrct2/interface/Chat.h index 9612acdbbe..e341fb2dc6 100644 --- a/src/openrct2/interface/Chat.h +++ b/src/openrct2/interface/Chat.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include "Colour.h" diff --git a/src/openrct2/interface/Colour.h b/src/openrct2/interface/Colour.h index 7c1bd123d4..6cdc50385c 100644 --- a/src/openrct2/interface/Colour.h +++ b/src/openrct2/interface/Colour.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/interface/Cursors.h b/src/openrct2/interface/Cursors.h index 4ee93edd2e..c8030070fd 100644 --- a/src/openrct2/interface/Cursors.h +++ b/src/openrct2/interface/Cursors.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include enum class CursorID : uint8_t diff --git a/src/openrct2/interface/InteractiveConsole.h b/src/openrct2/interface/InteractiveConsole.h index 99d38d3996..7d62f3843a 100644 --- a/src/openrct2/interface/InteractiveConsole.h +++ b/src/openrct2/interface/InteractiveConsole.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../localisation/FormatCodes.h" #include diff --git a/src/openrct2/interface/Screenshot.h b/src/openrct2/interface/Screenshot.h index 8cc470fb4d..667c7022bd 100644 --- a/src/openrct2/interface/Screenshot.h +++ b/src/openrct2/interface/Screenshot.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/FileSystem.hpp" #include "../world/Climate.h" #include "../world/Location.hpp" diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index a14a524ee6..d434b3641e 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../drawing/ImageId.hpp" #include "../localisation/Formatter.h" #include "../ride/RideTypes.h" diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 3c01685fc6..76a0ec26bb 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -173,7 +173,6 @@ - diff --git a/src/openrct2/localisation/ConversionTables.h b/src/openrct2/localisation/ConversionTables.h index c9f015ee73..ce2e7538b2 100644 --- a/src/openrct2/localisation/ConversionTables.h +++ b/src/openrct2/localisation/ConversionTables.h @@ -9,6 +9,4 @@ #pragma once -#include "../common.h" - wchar_t EncodingConvertRCT2ToUnicode(wchar_t rct2str); diff --git a/src/openrct2/localisation/Formatting.h b/src/openrct2/localisation/Formatting.h index 32f96580bf..ccf59bc84b 100644 --- a/src/openrct2/localisation/Formatting.h +++ b/src/openrct2/localisation/Formatting.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "FormatCodes.h" #include "Language.h" diff --git a/src/openrct2/localisation/LanguagePack.cpp b/src/openrct2/localisation/LanguagePack.cpp index 3d5c963d58..22bd415fa5 100644 --- a/src/openrct2/localisation/LanguagePack.cpp +++ b/src/openrct2/localisation/LanguagePack.cpp @@ -11,7 +11,6 @@ #include "../Context.h" #include "../Diagnostic.h" -#include "../common.h" #include "../core/FileStream.h" #include "../core/Memory.hpp" #include "../core/RTL.h" diff --git a/src/openrct2/localisation/Localisation.Date.cpp b/src/openrct2/localisation/Localisation.Date.cpp index d924a43d74..1b3fa404d4 100644 --- a/src/openrct2/localisation/Localisation.Date.cpp +++ b/src/openrct2/localisation/Localisation.Date.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../common.h" #include "Date.h" #include "StringIds.h" diff --git a/src/openrct2/localisation/Localisation.cpp b/src/openrct2/localisation/Localisation.cpp index 0a9175c399..23e3030c02 100644 --- a/src/openrct2/localisation/Localisation.cpp +++ b/src/openrct2/localisation/Localisation.cpp @@ -11,7 +11,6 @@ #include "../Diagnostic.h" #include "../Game.h" -#include "../common.h" #include "../config/Config.h" #include "../core/Guard.hpp" #include "../core/String.hpp" diff --git a/src/openrct2/management/Award.h b/src/openrct2/management/Award.h index e73e3de6d9..9181c42637 100644 --- a/src/openrct2/management/Award.h +++ b/src/openrct2/management/Award.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include enum class AwardType : uint16_t diff --git a/src/openrct2/management/Marketing.h b/src/openrct2/management/Marketing.h index 6013a609c9..62be7325ca 100644 --- a/src/openrct2/management/Marketing.h +++ b/src/openrct2/management/Marketing.h @@ -10,7 +10,6 @@ #pragma once #include "../Cheats.h" -#include "../common.h" #include "../ride/RideTypes.h" #include "../ride/ShopItem.h" diff --git a/src/openrct2/network/DiscordService.h b/src/openrct2/network/DiscordService.h index 07c06060e3..ab496b4055 100644 --- a/src/openrct2/network/DiscordService.h +++ b/src/openrct2/network/DiscordService.h @@ -11,7 +11,6 @@ #ifdef __ENABLE_DISCORD__ -# include "../common.h" # include "../core/Timer.hpp" # include diff --git a/src/openrct2/network/NetworkConnection.h b/src/openrct2/network/NetworkConnection.h index 35b94c8d04..ad65de39af 100644 --- a/src/openrct2/network/NetworkConnection.h +++ b/src/openrct2/network/NetworkConnection.h @@ -10,7 +10,7 @@ #pragma once #ifndef DISABLE_NETWORK -# include "../common.h" + # include "NetworkKey.h" # include "NetworkPacket.h" # include "NetworkTypes.h" diff --git a/src/openrct2/network/NetworkGroup.h b/src/openrct2/network/NetworkGroup.h index 78e298f02e..241445dac8 100644 --- a/src/openrct2/network/NetworkGroup.h +++ b/src/openrct2/network/NetworkGroup.h @@ -10,7 +10,6 @@ #pragma once #include "../Game.h" -#include "../common.h" #include "NetworkPacket.h" #include diff --git a/src/openrct2/network/NetworkKey.h b/src/openrct2/network/NetworkKey.h index 47044388e3..a0f64c5a67 100644 --- a/src/openrct2/network/NetworkKey.h +++ b/src/openrct2/network/NetworkKey.h @@ -11,8 +11,6 @@ #ifndef DISABLE_NETWORK -# include "../common.h" - # include # include # include diff --git a/src/openrct2/network/NetworkPacket.h b/src/openrct2/network/NetworkPacket.h index 4d9ef70dcc..1bf26372b7 100644 --- a/src/openrct2/network/NetworkPacket.h +++ b/src/openrct2/network/NetworkPacket.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/DataSerialiser.h" #include "NetworkTypes.h" diff --git a/src/openrct2/network/NetworkPlayer.h b/src/openrct2/network/NetworkPlayer.h index 00c253d03a..94e75fdcc8 100644 --- a/src/openrct2/network/NetworkPlayer.h +++ b/src/openrct2/network/NetworkPlayer.h @@ -10,7 +10,6 @@ #pragma once #include "../Game.h" -#include "../common.h" #include "../world/Map.h" #include diff --git a/src/openrct2/network/NetworkServerAdvertiser.h b/src/openrct2/network/NetworkServerAdvertiser.h index 8ab80e428c..e7b971ad19 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.h +++ b/src/openrct2/network/NetworkServerAdvertiser.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include enum class ADVERTISE_STATUS diff --git a/src/openrct2/network/NetworkTypes.h b/src/openrct2/network/NetworkTypes.h index 07a8684219..3ce6496d3c 100644 --- a/src/openrct2/network/NetworkTypes.h +++ b/src/openrct2/network/NetworkTypes.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/Endianness.h" #include "../ride/RideTypes.h" #include "../util/Util.h" diff --git a/src/openrct2/network/NetworkUser.h b/src/openrct2/network/NetworkUser.h index 27384d6294..fdcf76813a 100644 --- a/src/openrct2/network/NetworkUser.h +++ b/src/openrct2/network/NetworkUser.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/JsonFwd.hpp" #include "../core/String.hpp" diff --git a/src/openrct2/network/Socket.cpp b/src/openrct2/network/Socket.cpp index a05b0ff846..4772a54484 100644 --- a/src/openrct2/network/Socket.cpp +++ b/src/openrct2/network/Socket.cpp @@ -56,7 +56,7 @@ #include #include #include - #include "../common.h" + using SOCKET = int32_t; #define SOCKET_ERROR -1 #define INVALID_SOCKET -1 diff --git a/src/openrct2/network/Socket.h b/src/openrct2/network/Socket.h index 29a9b2eedf..c1f1207f08 100644 --- a/src/openrct2/network/Socket.h +++ b/src/openrct2/network/Socket.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include #include #include diff --git a/src/openrct2/object/BannerSceneryEntry.h b/src/openrct2/object/BannerSceneryEntry.h index 61b38ab474..555bafce99 100644 --- a/src/openrct2/object/BannerSceneryEntry.h +++ b/src/openrct2/object/BannerSceneryEntry.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/Money.hpp" #include "../localisation/StringIdType.h" #include "ObjectTypes.h" diff --git a/src/openrct2/object/EntranceEntry.h b/src/openrct2/object/EntranceEntry.h index d886cfb000..82a8499cbd 100644 --- a/src/openrct2/object/EntranceEntry.h +++ b/src/openrct2/object/EntranceEntry.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../localisation/StringIdType.h" #include "ObjectTypes.h" diff --git a/src/openrct2/object/FootpathEntry.h b/src/openrct2/object/FootpathEntry.h index f5fbe7b1e5..8bfb92ca5d 100644 --- a/src/openrct2/object/FootpathEntry.h +++ b/src/openrct2/object/FootpathEntry.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../localisation/StringIdType.h" #include "ObjectTypes.h" diff --git a/src/openrct2/object/ImageTable.h b/src/openrct2/object/ImageTable.h index 88853b4fc6..0ad344072c 100644 --- a/src/openrct2/object/ImageTable.h +++ b/src/openrct2/object/ImageTable.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/JsonFwd.hpp" #include "../drawing/Drawing.h" diff --git a/src/openrct2/object/Object.h b/src/openrct2/object/Object.h index 33121caea8..1616c39c57 100644 --- a/src/openrct2/object/Object.h +++ b/src/openrct2/object/Object.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/JsonFwd.hpp" #include "../core/String.hpp" #include "../util/Util.h" diff --git a/src/openrct2/object/ObjectFactory.h b/src/openrct2/object/ObjectFactory.h index db488b9086..d4e95aa913 100644 --- a/src/openrct2/object/ObjectFactory.h +++ b/src/openrct2/object/ObjectFactory.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/object/ObjectManager.h b/src/openrct2/object/ObjectManager.h index 00dd92d649..7e8a57c6f0 100644 --- a/src/openrct2/object/ObjectManager.h +++ b/src/openrct2/object/ObjectManager.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../object/Object.h" #include diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index 871f9a0405..de12b3b337 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" -#include "../common.h" #include "../core/Console.hpp" #include "../core/DataSerialiser.h" #include "../core/FileIndex.hpp" diff --git a/src/openrct2/object/ObjectRepository.h b/src/openrct2/object/ObjectRepository.h index e02ae6a04a..f55b98ac7c 100644 --- a/src/openrct2/object/ObjectRepository.h +++ b/src/openrct2/object/ObjectRepository.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../object/Object.h" #include "RideObject.h" diff --git a/src/openrct2/object/SceneryGroupEntry.h b/src/openrct2/object/SceneryGroupEntry.h index f8d742b34d..fdfdb0978d 100644 --- a/src/openrct2/object/SceneryGroupEntry.h +++ b/src/openrct2/object/SceneryGroupEntry.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../localisation/StringIdType.h" #include "../world/ScenerySelection.h" #include "ObjectTypes.h" diff --git a/src/openrct2/object/StringTable.h b/src/openrct2/object/StringTable.h index ed9d09b874..db42539dd8 100644 --- a/src/openrct2/object/StringTable.h +++ b/src/openrct2/object/StringTable.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/JsonFwd.hpp" #include "../localisation/Language.h" diff --git a/src/openrct2/object/WaterEntry.h b/src/openrct2/object/WaterEntry.h index 7c5372b881..b4709fec0f 100644 --- a/src/openrct2/object/WaterEntry.h +++ b/src/openrct2/object/WaterEntry.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../localisation/StringIdType.h" #include "ObjectTypes.h" diff --git a/src/openrct2/object/WaterObject.cpp b/src/openrct2/object/WaterObject.cpp index cff3ed0086..f34f0a204f 100644 --- a/src/openrct2/object/WaterObject.cpp +++ b/src/openrct2/object/WaterObject.cpp @@ -12,7 +12,6 @@ #include "WaterObject.h" #include "../OpenRCT2.h" -#include "../common.h" #include "../core/IStream.hpp" #include "../core/Json.hpp" #include "../localisation/Formatter.h" diff --git a/src/openrct2/openrct2_pch.h b/src/openrct2/openrct2_pch.h index 58c125034e..655dac226e 100644 --- a/src/openrct2/openrct2_pch.h +++ b/src/openrct2/openrct2_pch.h @@ -2,7 +2,6 @@ // Include some expensive headers here to improve compilation speed -#include "common.h" #include "core/FileSystem.hpp" #include "object/Object.h" #include "rct2/RCT2.h" diff --git a/src/openrct2/paint/Paint.SessionFlags.h b/src/openrct2/paint/Paint.SessionFlags.h index 873864d0ba..c1dadefd31 100644 --- a/src/openrct2/paint/Paint.SessionFlags.h +++ b/src/openrct2/paint/Paint.SessionFlags.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - namespace PaintSessionFlags { constexpr uint8_t PassedSurface = 1u << 0; diff --git a/src/openrct2/paint/Paint.h b/src/openrct2/paint/Paint.h index 55ea930ea3..c8a9d16e50 100644 --- a/src/openrct2/paint/Paint.h +++ b/src/openrct2/paint/Paint.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../drawing/Drawing.h" #include "../interface/Colour.h" #include "../world/Location.hpp" diff --git a/src/openrct2/paint/Painter.h b/src/openrct2/paint/Painter.h index 54a119fd0c..7d2d896ced 100644 --- a/src/openrct2/paint/Painter.h +++ b/src/openrct2/paint/Painter.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Paint.h" #include diff --git a/src/openrct2/paint/VirtualFloor.h b/src/openrct2/paint/VirtualFloor.h index 4038366ba4..1c9c372398 100644 --- a/src/openrct2/paint/VirtualFloor.h +++ b/src/openrct2/paint/VirtualFloor.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - struct CoordsXY; enum class VirtualFloorStyles : int32_t diff --git a/src/openrct2/paint/tile_element/Paint.TileElement.h b/src/openrct2/paint/tile_element/Paint.TileElement.h index 99a7d5e9e1..0ca26bf9ba 100644 --- a/src/openrct2/paint/tile_element/Paint.TileElement.h +++ b/src/openrct2/paint/tile_element/Paint.TileElement.h @@ -9,7 +9,6 @@ #pragma once -#include "../../common.h" #include "../../world/Map.h" struct PaintSession; diff --git a/src/openrct2/paint/tile_element/Paint.Wall.cpp b/src/openrct2/paint/tile_element/Paint.Wall.cpp index 71d4a66a75..d5b39bc1db 100644 --- a/src/openrct2/paint/tile_element/Paint.Wall.cpp +++ b/src/openrct2/paint/tile_element/Paint.Wall.cpp @@ -11,7 +11,6 @@ #include "../../Game.h" #include "../../GameState.h" -#include "../../common.h" #include "../../config/Config.h" #include "../../drawing/Drawing.h" #include "../../interface/Colour.h" diff --git a/src/openrct2/peep/GuestPathfinding.h b/src/openrct2/peep/GuestPathfinding.h index 199e774123..7b691ee384 100644 --- a/src/openrct2/peep/GuestPathfinding.h +++ b/src/openrct2/peep/GuestPathfinding.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../ride/RideTypes.h" #include "../world/Location.hpp" diff --git a/src/openrct2/platform/Platform.Common.cpp b/src/openrct2/platform/Platform.Common.cpp index b4dbe62b63..5a1cf6c380 100644 --- a/src/openrct2/platform/Platform.Common.cpp +++ b/src/openrct2/platform/Platform.Common.cpp @@ -8,7 +8,6 @@ *****************************************************************************/ #include "../Date.h" -#include "../common.h" #ifdef _WIN32 # ifndef WIN32_LEAN_AND_MEAN diff --git a/src/openrct2/platform/Platform.Win32.cpp b/src/openrct2/platform/Platform.Win32.cpp index 6fb8390306..b22db8b07d 100644 --- a/src/openrct2/platform/Platform.Win32.cpp +++ b/src/openrct2/platform/Platform.Win32.cpp @@ -29,7 +29,6 @@ # include "../Date.h" # include "../OpenRCT2.h" -# include "../common.h" # include "../core/Path.hpp" # include "../core/String.hpp" # include "../localisation/Date.h" diff --git a/src/openrct2/platform/Platform.h b/src/openrct2/platform/Platform.h index 7bb22d4909..55248a2db3 100644 --- a/src/openrct2/platform/Platform.h +++ b/src/openrct2/platform/Platform.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../config/ConfigTypes.h" #include "../core/DateTime.h" #include "../core/String.hpp" diff --git a/src/openrct2/rct1/Tables.cpp b/src/openrct2/rct1/Tables.cpp index cb9ca70424..73ceed76f1 100644 --- a/src/openrct2/rct1/Tables.cpp +++ b/src/openrct2/rct1/Tables.cpp @@ -10,7 +10,6 @@ #include "Tables.h" #include "../Diagnostic.h" -#include "../common.h" #include "../core/Guard.hpp" #include "../interface/Colour.h" #include "../object/ObjectManager.h" diff --git a/src/openrct2/rct1/Tables.h b/src/openrct2/rct1/Tables.h index bbcf180d06..bf4cc70674 100644 --- a/src/openrct2/rct1/Tables.h +++ b/src/openrct2/rct1/Tables.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../entity/Peep.h" #include "RCT1.h" diff --git a/src/openrct2/rct12/RCT12.h b/src/openrct2/rct12/RCT12.h index 9dd96900b5..f26cb808f7 100644 --- a/src/openrct2/rct12/RCT12.h +++ b/src/openrct2/rct12/RCT12.h @@ -11,7 +11,6 @@ // Structures shared between both RCT1 and RCT2. -#include "../common.h" #include "../management/Research.h" #include "../object/Object.h" #include "../ride/RideTypes.h" diff --git a/src/openrct2/rct12/SawyerChunk.h b/src/openrct2/rct12/SawyerChunk.h index 05e8bc2d7a..4da6f864b5 100644 --- a/src/openrct2/rct12/SawyerChunk.h +++ b/src/openrct2/rct12/SawyerChunk.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include /** diff --git a/src/openrct2/rct12/SawyerChunkReader.h b/src/openrct2/rct12/SawyerChunkReader.h index 5bbdc3a79b..b42b549116 100644 --- a/src/openrct2/rct12/SawyerChunkReader.h +++ b/src/openrct2/rct12/SawyerChunkReader.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/IStream.hpp" #include "../util/SawyerCoding.h" #include "SawyerChunk.h" diff --git a/src/openrct2/rct12/SawyerChunkWriter.h b/src/openrct2/rct12/SawyerChunkWriter.h index 9cc1fc44df..0b14bb413c 100644 --- a/src/openrct2/rct12/SawyerChunkWriter.h +++ b/src/openrct2/rct12/SawyerChunkWriter.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "SawyerChunk.h" #include diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h index 0c1a0c7bcc..ddec8d53eb 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/rct2/RCT2.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/FileSystem.hpp" #include "../core/FixedPoint.hpp" #include "../rct12/RCT12.h" diff --git a/src/openrct2/rct2/SeaDecrypt.cpp b/src/openrct2/rct2/SeaDecrypt.cpp index 4ce0465f9e..263efe3832 100644 --- a/src/openrct2/rct2/SeaDecrypt.cpp +++ b/src/openrct2/rct2/SeaDecrypt.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../common.h" #include "../core/File.h" #include "../core/Numerics.hpp" #include "../core/Path.hpp" diff --git a/src/openrct2/rct2/T6Exporter.h b/src/openrct2/rct2/T6Exporter.h index 200f4a43d9..19dde280e3 100644 --- a/src/openrct2/rct2/T6Exporter.h +++ b/src/openrct2/rct2/T6Exporter.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../ride/TrackDesign.h" #include diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 5393af7bbb..0fe57ba38a 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -23,7 +23,6 @@ #include "../actions/RideSetVehicleAction.h" #include "../audio/AudioMixer.h" #include "../audio/audio.h" -#include "../common.h" #include "../config/Config.h" #include "../core/BitSet.hpp" #include "../core/FixedVector.h" diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index fed69a499d..ca1ea5b8ff 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -11,7 +11,6 @@ #include "../Limits.h" #include "../actions/ResultWithMessage.h" -#include "../common.h" #include "../core/BitSet.hpp" #include "../core/FixedPoint.hpp" #include "../object/MusicObject.h" diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index a8cc31c680..d38e10272b 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -18,7 +18,6 @@ #include "../actions/RideSetStatusAction.h" #include "../actions/RideSetVehicleAction.h" #include "../actions/TrackRemoveAction.h" -#include "../common.h" #include "../core/FixedVector.h" #include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" diff --git a/src/openrct2/ride/RideConstruction.h b/src/openrct2/ride/RideConstruction.h index fbfead2504..d802c4bea6 100644 --- a/src/openrct2/ride/RideConstruction.h +++ b/src/openrct2/ride/RideConstruction.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../world/Location.hpp" #include "Station.h" #include "Track.h" diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index 400f8c3f01..04d79e825f 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -20,7 +20,6 @@ #define DEFAULT_STALL_COLOUR_PRESET TRACK_COLOUR_PRESETS({ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED }) #include "../audio/audio.h" -#include "../common.h" #include "../core/BitSet.hpp" #include "../entity/Guest.h" #include "../localisation/StringIds.h" diff --git a/src/openrct2/ride/RideRatings.h b/src/openrct2/ride/RideRatings.h index 0c50bc65bd..466ce43331 100644 --- a/src/openrct2/ride/RideRatings.h +++ b/src/openrct2/ride/RideRatings.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/FixedPoint.hpp" #include "../world/Location.hpp" #include "RideTypes.h" diff --git a/src/openrct2/ride/ShopItem.cpp b/src/openrct2/ride/ShopItem.cpp index f85620c1a2..da3c360e28 100644 --- a/src/openrct2/ride/ShopItem.cpp +++ b/src/openrct2/ride/ShopItem.cpp @@ -10,7 +10,6 @@ #include "ShopItem.h" #include "../GameState.h" -#include "../common.h" #include "../entity/Guest.h" #include "../localisation/StringIds.h" #include "../ride/RideEntry.h" diff --git a/src/openrct2/ride/ShopItem.h b/src/openrct2/ride/ShopItem.h index 078084e4be..23c706b7b3 100644 --- a/src/openrct2/ride/ShopItem.h +++ b/src/openrct2/ride/ShopItem.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/Money.hpp" #include "../entity/Litter.h" #include "../util/Util.h" diff --git a/src/openrct2/ride/Station.h b/src/openrct2/ride/Station.h index 94ddb4aa94..b697f98e21 100644 --- a/src/openrct2/ride/Station.h +++ b/src/openrct2/ride/Station.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" struct Ride; struct TileCoordsXYZD; diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h index fd67b01ed3..b0da909979 100644 --- a/src/openrct2/ride/Track.h +++ b/src/openrct2/ride/Track.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../object/Object.h" #include "../world/Map.h" #include "../world/TileElement.h" diff --git a/src/openrct2/ride/TrackData.h b/src/openrct2/ride/TrackData.h index bd5594b03f..8d1306b1d5 100644 --- a/src/openrct2/ride/TrackData.h +++ b/src/openrct2/ride/TrackData.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Track.h" constexpr uint8_t MaxSequencesPerPiece = 16; diff --git a/src/openrct2/ride/TrackDesign.h b/src/openrct2/ride/TrackDesign.h index cc820d310a..d020c2f31e 100644 --- a/src/openrct2/ride/TrackDesign.h +++ b/src/openrct2/ride/TrackDesign.h @@ -11,7 +11,6 @@ #include "../Limits.h" #include "../actions/GameActionResult.h" -#include "../common.h" #include "../object/Object.h" #include "../ride/RideColour.h" #include "../world/Map.h" diff --git a/src/openrct2/ride/TrackDesignRepository.h b/src/openrct2/ride/TrackDesignRepository.h index 318dbbcee7..ad4fcea532 100644 --- a/src/openrct2/ride/TrackDesignRepository.h +++ b/src/openrct2/ride/TrackDesignRepository.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include "RideTypes.h" diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h index a1f758f4f2..9e8c0b2028 100644 --- a/src/openrct2/ride/TrackPaint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../paint/Paint.h" #include "../paint/support/MetalSupports.h" #include "../paint/tile_element/Paint.TileElement.h" diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h index 15db70bd94..d1b2aa21c7 100644 --- a/src/openrct2/ride/Vehicle.h +++ b/src/openrct2/ride/Vehicle.h @@ -11,7 +11,6 @@ #include "../Identifiers.h" #include "../audio/audio.h" -#include "../common.h" #include "../entity/EntityBase.h" #include "../ride/RideTypes.h" #include "../world/Location.hpp" diff --git a/src/openrct2/ride/VehicleColour.h b/src/openrct2/ride/VehicleColour.h index 9fcced291c..1caa257aea 100644 --- a/src/openrct2/ride/VehicleColour.h +++ b/src/openrct2/ride/VehicleColour.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - struct VehicleColour { uint8_t Body; diff --git a/src/openrct2/ride/VehicleData.h b/src/openrct2/ride/VehicleData.h index 225c7eb575..180295aff3 100644 --- a/src/openrct2/ride/VehicleData.h +++ b/src/openrct2/ride/VehicleData.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - extern const uint8_t* Rotation1TimeToSpriteMaps[]; extern const uint8_t* Rotation2TimeToSpriteMaps[]; extern const uint8_t* Rotation3TimeToSpriteMaps[]; diff --git a/src/openrct2/ride/VehiclePaint.h b/src/openrct2/ride/VehiclePaint.h index 19e8f731dc..9a3005c069 100644 --- a/src/openrct2/ride/VehiclePaint.h +++ b/src/openrct2/ride/VehiclePaint.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - struct PaintSession; struct CarEntry; struct Vehicle; diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp index 9030a469aa..eead2ce601 100644 --- a/src/openrct2/ride/coaster/VirginiaReel.cpp +++ b/src/openrct2/ride/coaster/VirginiaReel.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/gentle/CarRide.cpp b/src/openrct2/ride/gentle/CarRide.cpp index 01202d6ec9..8aad741081 100644 --- a/src/openrct2/ride/gentle/CarRide.cpp +++ b/src/openrct2/ride/gentle/CarRide.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/MetalSupports.h" diff --git a/src/openrct2/ride/gentle/MonorailCycles.cpp b/src/openrct2/ride/gentle/MonorailCycles.cpp index b1a8857744..266cbcff23 100644 --- a/src/openrct2/ride/gentle/MonorailCycles.cpp +++ b/src/openrct2/ride/gentle/MonorailCycles.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/MetalSupports.h" diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp index 0c55e1a95c..d0f8b4e30b 100644 --- a/src/openrct2/ride/gentle/ObservationTower.cpp +++ b/src/openrct2/ride/gentle/ObservationTower.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index dbe01df865..5dfaac3257 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../entity/EntityRegistry.h" #include "../../entity/Guest.h" #include "../../interface/Viewport.h" diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index d8a9e2f47d..acc8eab691 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../entity/EntityRegistry.h" #include "../../interface/Viewport.h" #include "../../paint/Boundbox.h" diff --git a/src/openrct2/ride/thrill/GoKarts.cpp b/src/openrct2/ride/thrill/GoKarts.cpp index b9643c8baf..9735781f05 100644 --- a/src/openrct2/ride/thrill/GoKarts.cpp +++ b/src/openrct2/ride/thrill/GoKarts.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index 15e414dbb2..050a313843 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp index 6b479fc0aa..2258418c0f 100644 --- a/src/openrct2/ride/thrill/RotoDrop.cpp +++ b/src/openrct2/ride/thrill/RotoDrop.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index f61e8074d5..e3497b9d5f 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../entity/EntityRegistry.h" #include "../../interface/Viewport.h" #include "../../paint/Boundbox.h" diff --git a/src/openrct2/ride/transport/Lift.cpp b/src/openrct2/ride/transport/Lift.cpp index 76bd70e186..c31a19d584 100644 --- a/src/openrct2/ride/transport/Lift.cpp +++ b/src/openrct2/ride/transport/Lift.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp index a058bb12d8..deca87636b 100644 --- a/src/openrct2/ride/transport/MiniatureRailway.cpp +++ b/src/openrct2/ride/transport/MiniatureRailway.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index c5774d2f9e..917501d43b 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../object/StationObject.h" #include "../../paint/Boundbox.h" diff --git a/src/openrct2/ride/water/BoatHire.cpp b/src/openrct2/ride/water/BoatHire.cpp index 53cd4d9ff7..2783597755 100644 --- a/src/openrct2/ride/water/BoatHire.cpp +++ b/src/openrct2/ride/water/BoatHire.cpp @@ -8,7 +8,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/tile_element/Segment.h" diff --git a/src/openrct2/scenario/Scenario.h b/src/openrct2/scenario/Scenario.h index ce82e5d489..2f500e1d69 100644 --- a/src/openrct2/scenario/Scenario.h +++ b/src/openrct2/scenario/Scenario.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/Random.hpp" #include "../entity/EntityList.h" #include "../management/Finance.h" diff --git a/src/openrct2/scenario/ScenarioRepository.h b/src/openrct2/scenario/ScenarioRepository.h index 92cfab93d3..b814c616ae 100644 --- a/src/openrct2/scenario/ScenarioRepository.h +++ b/src/openrct2/scenario/ScenarioRepository.h @@ -10,7 +10,6 @@ #pragma once -#include "../common.h" #include "../core/DateTime.h" #include "../core/String.hpp" #include "../scenario/Scenario.h" diff --git a/src/openrct2/scenario/ScenarioSources.h b/src/openrct2/scenario/ScenarioSources.h index 0e4aa6d359..deabfa28d1 100644 --- a/src/openrct2/scenario/ScenarioSources.h +++ b/src/openrct2/scenario/ScenarioSources.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" struct SourceDescriptor diff --git a/src/openrct2/scenes/Scene.h b/src/openrct2/scenes/Scene.h index fce0571ad9..5515a3ff61 100644 --- a/src/openrct2/scenes/Scene.h +++ b/src/openrct2/scenes/Scene.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include namespace OpenRCT2 diff --git a/src/openrct2/scenes/game/GameScene.h b/src/openrct2/scenes/game/GameScene.h index c0b39ca89c..8921ab40a4 100644 --- a/src/openrct2/scenes/game/GameScene.h +++ b/src/openrct2/scenes/game/GameScene.h @@ -9,7 +9,6 @@ #pragma once -#include "../../common.h" #include "../Scene.h" namespace OpenRCT2 diff --git a/src/openrct2/scenes/intro/IntroScene.h b/src/openrct2/scenes/intro/IntroScene.h index df6f3da349..2980026fc0 100644 --- a/src/openrct2/scenes/intro/IntroScene.h +++ b/src/openrct2/scenes/intro/IntroScene.h @@ -9,7 +9,6 @@ #pragma once -#include "../../common.h" #include "../Scene.h" struct DrawPixelInfo; diff --git a/src/openrct2/scenes/title/TitleScene.h b/src/openrct2/scenes/title/TitleScene.h index 6cdf914d73..5a92fed19f 100644 --- a/src/openrct2/scenes/title/TitleScene.h +++ b/src/openrct2/scenes/title/TitleScene.h @@ -9,7 +9,6 @@ #pragma once -#include "../../common.h" #include "../../drawing/Drawing.h" #include "../Scene.h" diff --git a/src/openrct2/scenes/title/TitleSequence.cpp b/src/openrct2/scenes/title/TitleSequence.cpp index ba6578eee0..5a218823e7 100644 --- a/src/openrct2/scenes/title/TitleSequence.cpp +++ b/src/openrct2/scenes/title/TitleSequence.cpp @@ -10,7 +10,6 @@ #include "TitleSequence.h" #include "../../Diagnostic.h" -#include "../../common.h" #include "../../core/Collections.hpp" #include "../../core/Console.hpp" #include "../../core/File.h" diff --git a/src/openrct2/scenes/title/TitleSequence.h b/src/openrct2/scenes/title/TitleSequence.h index c786de1ae3..38bbdac5e1 100644 --- a/src/openrct2/scenes/title/TitleSequence.h +++ b/src/openrct2/scenes/title/TitleSequence.h @@ -9,7 +9,6 @@ #pragma once -#include "../../common.h" #include "../../core/IStream.hpp" #include "Command/End.h" #include "Command/FollowEntity.h" diff --git a/src/openrct2/scenes/title/TitleSequenceManager.h b/src/openrct2/scenes/title/TitleSequenceManager.h index 98912f9969..fa72615a19 100644 --- a/src/openrct2/scenes/title/TitleSequenceManager.h +++ b/src/openrct2/scenes/title/TitleSequenceManager.h @@ -8,7 +8,7 @@ *****************************************************************************/ #pragma once -#include "../../common.h" + #include "../../core/String.hpp" #include diff --git a/src/openrct2/scenes/title/TitleSequencePlayer.h b/src/openrct2/scenes/title/TitleSequencePlayer.h index f3058f86e3..59cf54ff83 100644 --- a/src/openrct2/scenes/title/TitleSequencePlayer.h +++ b/src/openrct2/scenes/title/TitleSequencePlayer.h @@ -9,8 +9,6 @@ #pragma once -#include "../../common.h" - struct ITitleSequencePlayer { virtual ~ITitleSequencePlayer() = default; diff --git a/src/openrct2/scripting/HookEngine.h b/src/openrct2/scripting/HookEngine.h index d737ca13da..3b78481f25 100644 --- a/src/openrct2/scripting/HookEngine.h +++ b/src/openrct2/scripting/HookEngine.h @@ -11,7 +11,6 @@ #ifdef ENABLE_SCRIPTING -# include "../common.h" # include "Duktape.hpp" # include diff --git a/src/openrct2/scripting/ScriptEngine.h b/src/openrct2/scripting/ScriptEngine.h index f9d890c48a..139a90d040 100644 --- a/src/openrct2/scripting/ScriptEngine.h +++ b/src/openrct2/scripting/ScriptEngine.h @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../actions/CustomAction.h" -# include "../common.h" # include "../core/FileWatcher.h" # include "../management/Finance.h" # include "../world/Location.hpp" diff --git a/src/openrct2/scripting/bindings/entity/ScEntity.hpp b/src/openrct2/scripting/bindings/entity/ScEntity.hpp index cf1cf6bd2c..1f5010d436 100644 --- a/src/openrct2/scripting/bindings/entity/ScEntity.hpp +++ b/src/openrct2/scripting/bindings/entity/ScEntity.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../../entity/EntityList.h" # include "../../../entity/EntityRegistry.h" # include "../../../entity/Peep.h" diff --git a/src/openrct2/scripting/bindings/object/ScInstalledObject.hpp b/src/openrct2/scripting/bindings/object/ScInstalledObject.hpp index 3b6a06fd11..7590eba2ee 100644 --- a/src/openrct2/scripting/bindings/object/ScInstalledObject.hpp +++ b/src/openrct2/scripting/bindings/object/ScInstalledObject.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../../object/ObjectRepository.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/scripting/bindings/object/ScObject.hpp b/src/openrct2/scripting/bindings/object/ScObject.hpp index 688cf5bc68..bca553c6a0 100644 --- a/src/openrct2/scripting/bindings/object/ScObject.hpp +++ b/src/openrct2/scripting/bindings/object/ScObject.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../../object/ObjectManager.h" # include "../../../object/RideObject.h" # include "../../../object/SceneryGroupObject.h" diff --git a/src/openrct2/scripting/bindings/ride/ScRide.cpp b/src/openrct2/scripting/bindings/ride/ScRide.cpp index 334c56f88a..cade909ad1 100644 --- a/src/openrct2/scripting/bindings/ride/ScRide.cpp +++ b/src/openrct2/scripting/bindings/ride/ScRide.cpp @@ -12,7 +12,6 @@ # include "ScRide.hpp" # include "../../../Context.h" -# include "../../../common.h" # include "../../../ride/Ride.h" # include "../../../ride/RideData.h" # include "../../Duktape.hpp" diff --git a/src/openrct2/scripting/bindings/ride/ScRide.hpp b/src/openrct2/scripting/bindings/ride/ScRide.hpp index 4ee2f3d9bd..6aded20cb9 100644 --- a/src/openrct2/scripting/bindings/ride/ScRide.hpp +++ b/src/openrct2/scripting/bindings/ride/ScRide.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../../ride/Ride.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/scripting/bindings/ride/ScRideStation.cpp b/src/openrct2/scripting/bindings/ride/ScRideStation.cpp index 529a5ff447..18a4c9e8b4 100644 --- a/src/openrct2/scripting/bindings/ride/ScRideStation.cpp +++ b/src/openrct2/scripting/bindings/ride/ScRideStation.cpp @@ -12,7 +12,6 @@ # include "ScRideStation.hpp" # include "../../../Context.h" -# include "../../../common.h" # include "../../../ride/Ride.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/scripting/bindings/ride/ScRideStation.hpp b/src/openrct2/scripting/bindings/ride/ScRideStation.hpp index 70b44217bf..9dd604290e 100644 --- a/src/openrct2/scripting/bindings/ride/ScRideStation.hpp +++ b/src/openrct2/scripting/bindings/ride/ScRideStation.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../../ride/Ride.h" # include "../../Duktape.hpp" diff --git a/src/openrct2/scripting/bindings/world/ScClimate.hpp b/src/openrct2/scripting/bindings/world/ScClimate.hpp index 699625d21c..4fc3ab8c05 100644 --- a/src/openrct2/scripting/bindings/world/ScClimate.hpp +++ b/src/openrct2/scripting/bindings/world/ScClimate.hpp @@ -13,7 +13,6 @@ # include "../../../Context.h" # include "../../../GameState.h" -# include "../../../common.h" # include "../../../core/String.hpp" # include "../../../world/Climate.h" # include "../../Duktape.hpp" diff --git a/src/openrct2/scripting/bindings/world/ScDate.hpp b/src/openrct2/scripting/bindings/world/ScDate.hpp index 7f4ca98786..b36ee2f8e2 100644 --- a/src/openrct2/scripting/bindings/world/ScDate.hpp +++ b/src/openrct2/scripting/bindings/world/ScDate.hpp @@ -15,7 +15,6 @@ # include "../../../Date.h" # include "../../../Game.h" # include "../../../GameState.h" -# include "../../../common.h" # include "../../../localisation/Date.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/scripting/bindings/world/ScMap.cpp b/src/openrct2/scripting/bindings/world/ScMap.cpp index bd14c9bf81..ba3dd30bdb 100644 --- a/src/openrct2/scripting/bindings/world/ScMap.cpp +++ b/src/openrct2/scripting/bindings/world/ScMap.cpp @@ -12,7 +12,6 @@ # include "ScMap.hpp" # include "../../../GameState.h" -# include "../../../common.h" # include "../../../entity/Balloon.h" # include "../../../entity/Duck.h" # include "../../../entity/EntityList.h" diff --git a/src/openrct2/scripting/bindings/world/ScMap.hpp b/src/openrct2/scripting/bindings/world/ScMap.hpp index d6236721f3..dcae067c71 100644 --- a/src/openrct2/scripting/bindings/world/ScMap.hpp +++ b/src/openrct2/scripting/bindings/world/ScMap.hpp @@ -11,7 +11,6 @@ #ifdef ENABLE_SCRIPTING -# include "../../../common.h" # include "../../Duktape.hpp" # include "../ride/ScRide.hpp" # include "../ride/ScTrackIterator.h" diff --git a/src/openrct2/scripting/bindings/world/ScPark.cpp b/src/openrct2/scripting/bindings/world/ScPark.cpp index 4c1dadf217..8c28008717 100644 --- a/src/openrct2/scripting/bindings/world/ScPark.cpp +++ b/src/openrct2/scripting/bindings/world/ScPark.cpp @@ -14,7 +14,6 @@ # include "../../../Context.h" # include "../../../Date.h" # include "../../../GameState.h" -# include "../../../common.h" # include "../../../core/String.hpp" # include "../../../entity/Guest.h" # include "../../../management/Finance.h" diff --git a/src/openrct2/scripting/bindings/world/ScPark.hpp b/src/openrct2/scripting/bindings/world/ScPark.hpp index 2ffa992b40..10a41b528d 100644 --- a/src/openrct2/scripting/bindings/world/ScPark.hpp +++ b/src/openrct2/scripting/bindings/world/ScPark.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../Duktape.hpp" # include "ScParkMessage.hpp" # include "ScResearch.hpp" diff --git a/src/openrct2/scripting/bindings/world/ScParkMessage.cpp b/src/openrct2/scripting/bindings/world/ScParkMessage.cpp index 407cbdcdb1..1274b29721 100644 --- a/src/openrct2/scripting/bindings/world/ScParkMessage.cpp +++ b/src/openrct2/scripting/bindings/world/ScParkMessage.cpp @@ -13,7 +13,6 @@ # include "../../../Context.h" # include "../../../GameState.h" -# include "../../../common.h" # include "../../../core/String.hpp" # include "../../../entity/Peep.h" # include "../../../management/Finance.h" diff --git a/src/openrct2/scripting/bindings/world/ScParkMessage.hpp b/src/openrct2/scripting/bindings/world/ScParkMessage.hpp index 3464669341..80f61af825 100644 --- a/src/openrct2/scripting/bindings/world/ScParkMessage.hpp +++ b/src/openrct2/scripting/bindings/world/ScParkMessage.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../../management/NewsItem.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/scripting/bindings/world/ScResearch.cpp b/src/openrct2/scripting/bindings/world/ScResearch.cpp index efb6b28204..ed0ec5beaf 100644 --- a/src/openrct2/scripting/bindings/world/ScResearch.cpp +++ b/src/openrct2/scripting/bindings/world/ScResearch.cpp @@ -13,7 +13,6 @@ # include "../../../Context.h" # include "../../../GameState.h" -# include "../../../common.h" # include "../../../core/String.hpp" # include "../../../management/Research.h" # include "../../../ride/RideData.h" diff --git a/src/openrct2/scripting/bindings/world/ScScenario.hpp b/src/openrct2/scripting/bindings/world/ScScenario.hpp index cdd0fd61e7..152efb4c71 100644 --- a/src/openrct2/scripting/bindings/world/ScScenario.hpp +++ b/src/openrct2/scripting/bindings/world/ScScenario.hpp @@ -13,7 +13,6 @@ # include "../../../Context.h" # include "../../../GameState.h" -# include "../../../common.h" # include "../../../core/String.hpp" # include "../../../scenario/Scenario.h" # include "../../../world/Park.h" diff --git a/src/openrct2/scripting/bindings/world/ScTile.cpp b/src/openrct2/scripting/bindings/world/ScTile.cpp index 913a7a5c93..3113592e72 100644 --- a/src/openrct2/scripting/bindings/world/ScTile.cpp +++ b/src/openrct2/scripting/bindings/world/ScTile.cpp @@ -12,7 +12,6 @@ # include "ScTile.hpp" # include "../../../Context.h" -# include "../../../common.h" # include "../../../core/Guard.hpp" # include "../../../entity/EntityRegistry.h" # include "../../../object/LargeSceneryEntry.h" diff --git a/src/openrct2/scripting/bindings/world/ScTile.hpp b/src/openrct2/scripting/bindings/world/ScTile.hpp index 35784a6e31..ff5c2b0271 100644 --- a/src/openrct2/scripting/bindings/world/ScTile.hpp +++ b/src/openrct2/scripting/bindings/world/ScTile.hpp @@ -11,7 +11,6 @@ #ifdef ENABLE_SCRIPTING -# include "../../../common.h" # include "../../Duktape.hpp" # include "ScTileElement.hpp" diff --git a/src/openrct2/scripting/bindings/world/ScTileElement.cpp b/src/openrct2/scripting/bindings/world/ScTileElement.cpp index 3166a68c49..c858452ab8 100644 --- a/src/openrct2/scripting/bindings/world/ScTileElement.cpp +++ b/src/openrct2/scripting/bindings/world/ScTileElement.cpp @@ -12,7 +12,6 @@ # include "ScTileElement.hpp" # include "../../../Context.h" -# include "../../../common.h" # include "../../../core/Guard.hpp" # include "../../../entity/EntityRegistry.h" # include "../../../object/LargeSceneryEntry.h" diff --git a/src/openrct2/scripting/bindings/world/ScTileElement.hpp b/src/openrct2/scripting/bindings/world/ScTileElement.hpp index a5bcddc084..9ac6a6a0c5 100644 --- a/src/openrct2/scripting/bindings/world/ScTileElement.hpp +++ b/src/openrct2/scripting/bindings/world/ScTileElement.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../../core/Guard.hpp" # include "../../../entity/EntityRegistry.h" # include "../../../ride/Track.h" diff --git a/src/openrct2/ui/UiContext.h b/src/openrct2/ui/UiContext.h index ba6ab32949..8ede8f67d5 100644 --- a/src/openrct2/ui/UiContext.h +++ b/src/openrct2/ui/UiContext.h @@ -10,7 +10,6 @@ #pragma once #include "../Context.h" -#include "../common.h" #include "../config/ConfigTypes.h" #include "../interface/Cursors.h" diff --git a/src/openrct2/ui/WindowManager.h b/src/openrct2/ui/WindowManager.h index 8138d93b11..3ed656ce39 100644 --- a/src/openrct2/ui/WindowManager.h +++ b/src/openrct2/ui/WindowManager.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../interface/Window.h" #include "../windows/Intent.h" diff --git a/src/openrct2/util/SawyerCoding.h b/src/openrct2/util/SawyerCoding.h index adc6714b65..d8240cb983 100644 --- a/src/openrct2/util/SawyerCoding.h +++ b/src/openrct2/util/SawyerCoding.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #pragma pack(push, 1) struct SawyerCodingChunkHeader { diff --git a/src/openrct2/util/Util.cpp b/src/openrct2/util/Util.cpp index f43d234c53..c8fe259be4 100644 --- a/src/openrct2/util/Util.cpp +++ b/src/openrct2/util/Util.cpp @@ -10,7 +10,6 @@ #include "Util.h" #include "../Diagnostic.h" -#include "../common.h" #include "../core/Guard.hpp" #include "../core/Path.hpp" #include "../core/UTF8.h" diff --git a/src/openrct2/windows/Intent.h b/src/openrct2/windows/Intent.h index 3707b6d96b..69cb3c9bfd 100644 --- a/src/openrct2/windows/Intent.h +++ b/src/openrct2/windows/Intent.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/Identifier.hpp" #include "../interface/Window.h" diff --git a/src/openrct2/world/Banner.h b/src/openrct2/world/Banner.h index ade42af3ab..287e8cb172 100644 --- a/src/openrct2/world/Banner.h +++ b/src/openrct2/world/Banner.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../ride/RideTypes.h" #include "Location.hpp" diff --git a/src/openrct2/world/Climate.h b/src/openrct2/world/Climate.h index 78190b3551..d8bb1354df 100644 --- a/src/openrct2/world/Climate.h +++ b/src/openrct2/world/Climate.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../drawing/Drawing.h" #include "../util/Util.h" diff --git a/src/openrct2/world/ConstructionClearance.h b/src/openrct2/world/ConstructionClearance.h index d7b0c62a68..a9ab2da454 100644 --- a/src/openrct2/world/ConstructionClearance.h +++ b/src/openrct2/world/ConstructionClearance.h @@ -10,7 +10,6 @@ #pragma once #include "../actions/GameActionResult.h" -#include "../common.h" #include "Map.h" #include diff --git a/src/openrct2/world/Entrance.h b/src/openrct2/world/Entrance.h index 8bb4de0b9c..9b475642d9 100644 --- a/src/openrct2/world/Entrance.h +++ b/src/openrct2/world/Entrance.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "Location.hpp" #include "Map.h" diff --git a/src/openrct2/world/Footpath.h b/src/openrct2/world/Footpath.h index 30869b7faf..6368edb347 100644 --- a/src/openrct2/world/Footpath.h +++ b/src/openrct2/world/Footpath.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../interface/Viewport.h" #include "../object/Object.h" diff --git a/src/openrct2/world/LargeScenery.cpp b/src/openrct2/world/LargeScenery.cpp index 77ba5cdc7b..f53c595fd7 100644 --- a/src/openrct2/world/LargeScenery.cpp +++ b/src/openrct2/world/LargeScenery.cpp @@ -10,7 +10,6 @@ #include "LargeScenery.h" #include "../Context.h" -#include "../common.h" #include "../object/LargeSceneryObject.h" #include "../object/ObjectEntryManager.h" #include "../object/ObjectManager.h" diff --git a/src/openrct2/world/Location.hpp b/src/openrct2/world/Location.hpp index df22877063..0562232dee 100644 --- a/src/openrct2/world/Location.hpp +++ b/src/openrct2/world/Location.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../util/Math.hpp" constexpr int16_t LOCATION_NULL = -32768; diff --git a/src/openrct2/world/Map.h b/src/openrct2/world/Map.h index 9a684bfdbc..1af21d8db4 100644 --- a/src/openrct2/world/Map.h +++ b/src/openrct2/world/Map.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Location.hpp" #include "TileElement.h" diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp index 95d59d4a27..ceeb6cb0a7 100644 --- a/src/openrct2/world/MapGen.cpp +++ b/src/openrct2/world/MapGen.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" -#include "../common.h" #include "../core/Guard.hpp" #include "../core/Imaging.h" #include "../core/String.hpp" diff --git a/src/openrct2/world/MapGen.h b/src/openrct2/world/MapGen.h index 2050624217..fe57ff121e 100644 --- a/src/openrct2/world/MapGen.h +++ b/src/openrct2/world/MapGen.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include "Location.hpp" diff --git a/src/openrct2/world/MapHelpers.h b/src/openrct2/world/MapHelpers.h index 91d15e951b..e953445800 100644 --- a/src/openrct2/world/MapHelpers.h +++ b/src/openrct2/world/MapHelpers.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Location.hpp" enum diff --git a/src/openrct2/world/Park.h b/src/openrct2/world/Park.h index 5a7814b753..737c87775a 100644 --- a/src/openrct2/world/Park.h +++ b/src/openrct2/world/Park.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../management/Finance.h" #include "Map.h" diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp index 73ed9b9424..195ad6bae9 100644 --- a/src/openrct2/world/Scenery.cpp +++ b/src/openrct2/world/Scenery.cpp @@ -19,7 +19,6 @@ #include "../actions/LargeSceneryRemoveAction.h" #include "../actions/SmallSceneryRemoveAction.h" #include "../actions/WallRemoveAction.h" -#include "../common.h" #include "../core/String.hpp" #include "../entity/Fountain.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/world/Surface.h b/src/openrct2/world/Surface.h index 578a8992e8..d2d48698da 100644 --- a/src/openrct2/world/Surface.h +++ b/src/openrct2/world/Surface.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "TileElement.h" enum diff --git a/src/openrct2/world/TileElement.h b/src/openrct2/world/TileElement.h index 183253eac7..ec5a46fb5a 100644 --- a/src/openrct2/world/TileElement.h +++ b/src/openrct2/world/TileElement.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../ride/RideTypes.h" #include "../ride/Station.h" #include "Banner.h" diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index 217ba1ef59..52c69db755 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../Game.h" #include "../actions/GameAction.h" -#include "../common.h" #include "../core/Guard.hpp" #include "../interface/Window.h" #include "../interface/Window_internal.h" diff --git a/src/openrct2/world/TileInspector.h b/src/openrct2/world/TileInspector.h index 3ba6ba3463..421beeb3e1 100644 --- a/src/openrct2/world/TileInspector.h +++ b/src/openrct2/world/TileInspector.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Map.h" namespace GameActions diff --git a/src/openrct2/world/Wall.cpp b/src/openrct2/world/Wall.cpp index 8b735c5bcf..f8b9871ce0 100644 --- a/src/openrct2/world/Wall.cpp +++ b/src/openrct2/world/Wall.cpp @@ -12,7 +12,6 @@ #include "../Cheats.h" #include "../Game.h" #include "../OpenRCT2.h" -#include "../common.h" #include "../localisation/StringIds.h" #include "../management/Finance.h" #include "../network/network.h" diff --git a/src/openrct2/world/Wall.h b/src/openrct2/world/Wall.h index 8ea639d0cf..354c5bafc2 100644 --- a/src/openrct2/world/Wall.h +++ b/src/openrct2/world/Wall.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "TileElement.h" enum From 3b42bbb2f338cf58ae473b81d2027b7b743edd30 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 16:49:47 +0200 Subject: [PATCH 12/13] Include cstdint and cstddef as needed at unit level --- src/openrct2/Date.h | 2 ++ src/openrct2/command_line/CommandLine.hpp | 2 ++ src/openrct2/core/Endianness.h | 1 + src/openrct2/core/String.hpp | 1 + src/openrct2/drawing/LightFX.h | 2 ++ src/openrct2/drawing/Weather.h | 2 ++ src/openrct2/interface/Colour.h | 1 + src/openrct2/interface/Cursors.h | 1 + src/openrct2/management/Award.h | 1 + src/openrct2/paint/Paint.SessionFlags.h | 2 ++ src/openrct2/paint/VirtualFloor.h | 2 ++ src/openrct2/ride/VehicleColour.h | 2 ++ src/openrct2/ride/VehicleData.h | 2 ++ src/openrct2/ride/VehiclePaint.h | 2 ++ src/openrct2/scenes/intro/IntroScene.h | 2 ++ src/openrct2/scenes/title/TitleSequencePlayer.h | 3 +++ src/openrct2/util/SawyerCoding.h | 3 +++ src/openrct2/world/Location.hpp | 2 ++ 18 files changed, 33 insertions(+) diff --git a/src/openrct2/Date.h b/src/openrct2/Date.h index 59128511fc..724815336c 100644 --- a/src/openrct2/Date.h +++ b/src/openrct2/Date.h @@ -9,6 +9,8 @@ #pragma once +#include + constexpr int32_t kMaxYear = 8192; constexpr int32_t kTicksPerMonth = 0x10000; diff --git a/src/openrct2/command_line/CommandLine.hpp b/src/openrct2/command_line/CommandLine.hpp index 2995d7557d..fb44894eed 100644 --- a/src/openrct2/command_line/CommandLine.hpp +++ b/src/openrct2/command_line/CommandLine.hpp @@ -9,6 +9,8 @@ #pragma once +#include + /** * Class for enumerating and retrieving values for a set of command line arguments. */ diff --git a/src/openrct2/core/Endianness.h b/src/openrct2/core/Endianness.h index e395a45d8e..9e6fb23782 100644 --- a/src/openrct2/core/Endianness.h +++ b/src/openrct2/core/Endianness.h @@ -9,6 +9,7 @@ #pragma once +#include #include #include diff --git a/src/openrct2/core/String.hpp b/src/openrct2/core/String.hpp index 21d47019fe..591a135cbc 100644 --- a/src/openrct2/core/String.hpp +++ b/src/openrct2/core/String.hpp @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/src/openrct2/drawing/LightFX.h b/src/openrct2/drawing/LightFX.h index 146445cf75..1c869f59ff 100644 --- a/src/openrct2/drawing/LightFX.h +++ b/src/openrct2/drawing/LightFX.h @@ -9,6 +9,8 @@ #pragma once +#include + struct CoordsXY; struct Vehicle; struct DrawPixelInfo; diff --git a/src/openrct2/drawing/Weather.h b/src/openrct2/drawing/Weather.h index 011635925b..72bf4fa478 100644 --- a/src/openrct2/drawing/Weather.h +++ b/src/openrct2/drawing/Weather.h @@ -9,6 +9,8 @@ #pragma once +#include + struct DrawPixelInfo; namespace OpenRCT2::Drawing diff --git a/src/openrct2/interface/Colour.h b/src/openrct2/interface/Colour.h index 6cdc50385c..d333c6838b 100644 --- a/src/openrct2/interface/Colour.h +++ b/src/openrct2/interface/Colour.h @@ -11,6 +11,7 @@ #include "../core/String.hpp" +#include #include using colour_t = uint8_t; diff --git a/src/openrct2/interface/Cursors.h b/src/openrct2/interface/Cursors.h index c8030070fd..796779c155 100644 --- a/src/openrct2/interface/Cursors.h +++ b/src/openrct2/interface/Cursors.h @@ -9,6 +9,7 @@ #pragma once +#include #include enum class CursorID : uint8_t diff --git a/src/openrct2/management/Award.h b/src/openrct2/management/Award.h index 9181c42637..d0d5f9a74e 100644 --- a/src/openrct2/management/Award.h +++ b/src/openrct2/management/Award.h @@ -9,6 +9,7 @@ #pragma once +#include #include enum class AwardType : uint16_t diff --git a/src/openrct2/paint/Paint.SessionFlags.h b/src/openrct2/paint/Paint.SessionFlags.h index c1dadefd31..15c3d343c7 100644 --- a/src/openrct2/paint/Paint.SessionFlags.h +++ b/src/openrct2/paint/Paint.SessionFlags.h @@ -9,6 +9,8 @@ #pragma once +#include + namespace PaintSessionFlags { constexpr uint8_t PassedSurface = 1u << 0; diff --git a/src/openrct2/paint/VirtualFloor.h b/src/openrct2/paint/VirtualFloor.h index 1c9c372398..c0ab80a784 100644 --- a/src/openrct2/paint/VirtualFloor.h +++ b/src/openrct2/paint/VirtualFloor.h @@ -9,6 +9,8 @@ #pragma once +#include + struct CoordsXY; enum class VirtualFloorStyles : int32_t diff --git a/src/openrct2/ride/VehicleColour.h b/src/openrct2/ride/VehicleColour.h index 1caa257aea..a40e7472ce 100644 --- a/src/openrct2/ride/VehicleColour.h +++ b/src/openrct2/ride/VehicleColour.h @@ -9,6 +9,8 @@ #pragma once +#include + struct VehicleColour { uint8_t Body; diff --git a/src/openrct2/ride/VehicleData.h b/src/openrct2/ride/VehicleData.h index 180295aff3..efede5084f 100644 --- a/src/openrct2/ride/VehicleData.h +++ b/src/openrct2/ride/VehicleData.h @@ -9,6 +9,8 @@ #pragma once +#include + extern const uint8_t* Rotation1TimeToSpriteMaps[]; extern const uint8_t* Rotation2TimeToSpriteMaps[]; extern const uint8_t* Rotation3TimeToSpriteMaps[]; diff --git a/src/openrct2/ride/VehiclePaint.h b/src/openrct2/ride/VehiclePaint.h index 9a3005c069..2cd46ffc38 100644 --- a/src/openrct2/ride/VehiclePaint.h +++ b/src/openrct2/ride/VehiclePaint.h @@ -9,6 +9,8 @@ #pragma once +#include + struct PaintSession; struct CarEntry; struct Vehicle; diff --git a/src/openrct2/scenes/intro/IntroScene.h b/src/openrct2/scenes/intro/IntroScene.h index 2980026fc0..1dca97680c 100644 --- a/src/openrct2/scenes/intro/IntroScene.h +++ b/src/openrct2/scenes/intro/IntroScene.h @@ -11,6 +11,8 @@ #include "../Scene.h" +#include + struct DrawPixelInfo; namespace OpenRCT2 diff --git a/src/openrct2/scenes/title/TitleSequencePlayer.h b/src/openrct2/scenes/title/TitleSequencePlayer.h index 59cf54ff83..8f078fcaf1 100644 --- a/src/openrct2/scenes/title/TitleSequencePlayer.h +++ b/src/openrct2/scenes/title/TitleSequencePlayer.h @@ -9,6 +9,9 @@ #pragma once +#include +#include + struct ITitleSequencePlayer { virtual ~ITitleSequencePlayer() = default; diff --git a/src/openrct2/util/SawyerCoding.h b/src/openrct2/util/SawyerCoding.h index d8240cb983..2997d587a4 100644 --- a/src/openrct2/util/SawyerCoding.h +++ b/src/openrct2/util/SawyerCoding.h @@ -9,6 +9,9 @@ #pragma once +#include +#include + #pragma pack(push, 1) struct SawyerCodingChunkHeader { diff --git a/src/openrct2/world/Location.hpp b/src/openrct2/world/Location.hpp index 0562232dee..6f43daaf53 100644 --- a/src/openrct2/world/Location.hpp +++ b/src/openrct2/world/Location.hpp @@ -11,6 +11,8 @@ #include "../util/Math.hpp" +#include + constexpr int16_t LOCATION_NULL = -32768; constexpr int32_t COORDS_XY_STEP = 32; From 44e09149d9ee83d1c5db3fb5a42fe2a0e4f0863b Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 17:08:42 +0200 Subject: [PATCH 13/13] Make isatty warning suppression local to StdInOutConsole.cpp --- src/openrct2/interface/StdInOutConsole.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/openrct2/interface/StdInOutConsole.cpp b/src/openrct2/interface/StdInOutConsole.cpp index f5050348ad..dc64a0930c 100644 --- a/src/openrct2/interface/StdInOutConsole.cpp +++ b/src/openrct2/interface/StdInOutConsole.cpp @@ -17,6 +17,11 @@ #include +// Ignore isatty warning on WIN32 +#ifdef _MSC_VER +# pragma warning(disable : 4996) +#endif + using namespace OpenRCT2; void StdInOutConsole::Start()