From d574946c1ab10af02ef3f631de6e2b03b4fb1e39 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Sat, 3 Aug 2024 20:46:58 +0200 Subject: [PATCH] Remove includes of Cursors.h in object header files --- src/openrct2/object/LargeSceneryEntry.h | 5 ++++- src/openrct2/object/PathAdditionEntry.h | 3 ++- src/openrct2/object/SmallSceneryEntry.h | 3 ++- src/openrct2/object/WallSceneryEntry.h | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/openrct2/object/LargeSceneryEntry.h b/src/openrct2/object/LargeSceneryEntry.h index d20701b335..3afee6fecb 100644 --- a/src/openrct2/object/LargeSceneryEntry.h +++ b/src/openrct2/object/LargeSceneryEntry.h @@ -10,11 +10,14 @@ #pragma once #include "../core/Money.hpp" -#include "../interface/Cursors.h" #include "../localisation/StringIdType.h" #include "../world/Location.hpp" #include "ObjectTypes.h" +#include + +enum class CursorID : uint8_t; + struct LargeSceneryText; struct LargeSceneryTile diff --git a/src/openrct2/object/PathAdditionEntry.h b/src/openrct2/object/PathAdditionEntry.h index 4f8e95ec3f..858fc91cac 100644 --- a/src/openrct2/object/PathAdditionEntry.h +++ b/src/openrct2/object/PathAdditionEntry.h @@ -10,10 +10,11 @@ #pragma once #include "../core/Money.hpp" -#include "../interface/Cursors.h" #include "../localisation/StringIdType.h" #include "ObjectTypes.h" +enum class CursorID : uint8_t; + enum class PathAdditionDrawType : uint8_t { Light, diff --git a/src/openrct2/object/SmallSceneryEntry.h b/src/openrct2/object/SmallSceneryEntry.h index 07c9c445ff..942a584ea8 100644 --- a/src/openrct2/object/SmallSceneryEntry.h +++ b/src/openrct2/object/SmallSceneryEntry.h @@ -10,10 +10,11 @@ #pragma once #include "../core/Money.hpp" -#include "../interface/Cursors.h" #include "../localisation/StringIdType.h" #include "ObjectTypes.h" +enum class CursorID : uint8_t; + enum SMALL_SCENERY_FLAGS : uint32_t { SMALL_SCENERY_FLAG_FULL_TILE = (1 << 0), // 0x1 diff --git a/src/openrct2/object/WallSceneryEntry.h b/src/openrct2/object/WallSceneryEntry.h index 61118628fa..eb0b07dbb7 100644 --- a/src/openrct2/object/WallSceneryEntry.h +++ b/src/openrct2/object/WallSceneryEntry.h @@ -10,10 +10,11 @@ #pragma once #include "../core/Money.hpp" -#include "../interface/Cursors.h" #include "../localisation/StringIdType.h" #include "ObjectTypes.h" +enum class CursorID : uint8_t; + enum WALL_SCENERY_FLAGS { WALL_SCENERY_HAS_PRIMARY_COLOUR = (1 << 0), // 0x1