From dae5b00f0503ac2a0973d5d0288110e2574d23c0 Mon Sep 17 00:00:00 2001 From: Greg <1565947+scaryghosty@users.noreply.github.com> Date: Sun, 11 Aug 2024 05:58:28 -0400 Subject: [PATCH] Close #22509: Refactor SPR_NONE to ImageIndex (#22517) * ImageIndex typedef moved from ImageId.hpp to new file ImageIndexType.h. * SPR_NONE redefined as ImageIndex type in ImageIndexType.h. * SPR_NONE renamed to kSpriteIdNull * Remove casts and enum all sprites as ImageIndex * Remove sprites.h include from LandTool.h, RideData.h * Ensure all RTD headers include sprites.h --------- Co-authored-by: Aaron van Geffen --- src/openrct2-ui/interface/LandTool.cpp | 1 + src/openrct2-ui/interface/LandTool.h | 1 - src/openrct2-ui/interface/Widget.cpp | 2 +- src/openrct2-ui/windows/ClearScenery.cpp | 1 + .../windows/EditorObjectSelection.cpp | 2 +- src/openrct2-ui/windows/EditorParkEntrance.cpp | 2 +- src/openrct2-ui/windows/Footpath.cpp | 10 +++++----- src/openrct2-ui/windows/Land.cpp | 1 + src/openrct2-ui/windows/LandRights.cpp | 1 + src/openrct2-ui/windows/Map.cpp | 1 + src/openrct2-ui/windows/MapGen.cpp | 1 + src/openrct2-ui/windows/Park.cpp | 1 + src/openrct2-ui/windows/PatrolArea.cpp | 1 + src/openrct2-ui/windows/SceneryScatter.cpp | 1 + src/openrct2-ui/windows/TopToolbar.cpp | 1 + src/openrct2-ui/windows/Water.cpp | 1 + src/openrct2/drawing/Drawing.Sprite.cpp | 2 +- src/openrct2/drawing/Font.cpp | 2 +- src/openrct2/drawing/ImageId.hpp | 3 ++- src/openrct2/drawing/ImageIndexType.h | 17 +++++++++++++++++ src/openrct2/drawing/ScrollingText.cpp | 2 +- src/openrct2/entity/Guest.cpp | 1 + src/openrct2/interface/Window.cpp | 1 - src/openrct2/object/Object.h | 1 + .../paint/tile_element/Paint.Banner.cpp | 1 - .../paint/tile_element/Paint.Entrance.cpp | 1 + src/openrct2/paint/vehicle/VehiclePaint.cpp | 1 + src/openrct2/ride/RideData.h | 4 ++-- src/openrct2/ride/rtd/coaster/AlpineCoaster.h | 1 + .../ride/rtd/coaster/ClassicMiniRollerCoaster.h | 1 + src/openrct2/ride/rtd/coaster/HybridCoaster.h | 1 + src/openrct2/ride/rtd/coaster/HyperTwister.h | 1 + src/openrct2/ride/rtd/coaster/Hypercoaster.h | 1 + .../ride/rtd/coaster/SingleRailRollerCoaster.h | 1 + .../ride/rtd/coaster/SpinningWildMouse.h | 1 + src/openrct2/ride/rtd/gentle/MonsterTrucks.h | 1 + src/openrct2/sprites.h | 5 ++--- 37 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 src/openrct2/drawing/ImageIndexType.h diff --git a/src/openrct2-ui/interface/LandTool.cpp b/src/openrct2-ui/interface/LandTool.cpp index 04a8c82870..f884fece36 100644 --- a/src/openrct2-ui/interface/LandTool.cpp +++ b/src/openrct2-ui/interface/LandTool.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include diff --git a/src/openrct2-ui/interface/LandTool.h b/src/openrct2-ui/interface/LandTool.h index 8da678d76a..552e3cb28c 100644 --- a/src/openrct2-ui/interface/LandTool.h +++ b/src/openrct2-ui/interface/LandTool.h @@ -10,7 +10,6 @@ #pragma once #include -#include constexpr uint16_t kLandToolMinimumSize = 1; constexpr uint16_t kLandToolMaximumSize = 64; diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index 6b8f7a8b2c..e7a5d8885f 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -822,7 +822,7 @@ namespace OpenRCT2::Ui const auto& widget = w.widgets[widgetIndex]; // Get the image - if (static_cast(widget.image.ToUInt32()) == SPR_NONE) + if (widget.image.ToUInt32() == kSpriteIdNull) return; auto image = widget.image; diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp index 542d5f689e..785957fca0 100644 --- a/src/openrct2-ui/windows/ClearScenery.cpp +++ b/src/openrct2-ui/windows/ClearScenery.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index fccfc6141c..296d2b94a6 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -906,7 +906,7 @@ namespace OpenRCT2::Ui::Windows for (size_t i = 0; i < std::size(ObjectSelectionPages); i++) { auto& widget = widgets[WIDX_TAB_1 + i]; - if (ObjectSelectionPages[i].Image != static_cast(SPR_NONE)) + if (ObjectSelectionPages[i].Image != kSpriteIdNull) { widget.type = WindowWidgetType::Tab; widget.left = x; diff --git a/src/openrct2-ui/windows/EditorParkEntrance.cpp b/src/openrct2-ui/windows/EditorParkEntrance.cpp index c141238f56..47a84eb4e7 100644 --- a/src/openrct2-ui/windows/EditorParkEntrance.cpp +++ b/src/openrct2-ui/windows/EditorParkEntrance.cpp @@ -37,7 +37,7 @@ namespace OpenRCT2::Ui::Windows { ObjectEntryIndex entryIndex = OBJECT_ENTRY_INDEX_NULL; StringId stringId = STR_NONE; - ImageIndex imageId = static_cast(SPR_NONE); + ImageIndex imageId = kSpriteIdNull; }; enum WindowEditorParkEntranceListWidgetIdx diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 4436fd8460..e0885de888 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -559,8 +559,8 @@ static constexpr uint8_t ConstructionPreviewImages[][4] = { if (gFootpathSelection.LegacyPath == OBJECT_ENTRY_INDEX_NULL) { // Set footpath and queue type button images - auto pathImage = static_cast(SPR_NONE); - auto queueImage = static_cast(SPR_NONE); + auto pathImage = kSpriteIdNull; + auto queueImage = kSpriteIdNull; auto pathEntry = GetPathSurfaceEntry(gFootpathSelection.NormalSurface); if (pathEntry != nullptr) { @@ -577,7 +577,7 @@ static constexpr uint8_t ConstructionPreviewImages[][4] = { WindowFootpathDrawDropdownButton(dpi, WIDX_QUEUELINE_TYPE, queueImage); // Set railing - auto railingsImage = static_cast(SPR_NONE); + auto railingsImage = kSpriteIdNull; auto railingsEntry = GetPathRailingsEntry(gFootpathSelection.Railings); if (railingsEntry != nullptr) { @@ -590,8 +590,8 @@ static constexpr uint8_t ConstructionPreviewImages[][4] = { auto& objManager = OpenRCT2::GetContext()->GetObjectManager(); // Set footpath and queue type button images - auto pathImage = static_cast(SPR_NONE); - auto queueImage = static_cast(SPR_NONE); + auto pathImage = kSpriteIdNull; + auto queueImage = kSpriteIdNull; auto pathObj = static_cast( objManager.GetLoadedObject(ObjectType::Paths, gFootpathSelection.LegacyPath)); if (pathObj != nullptr) diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index 96087ac0db..db3adb7218 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index fad6739669..fba09f3d00 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 744b1d63f4..8ab1b1f087 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 33f40ebd90..fcba8418e2 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 1068c49ada..3ae4419206 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include diff --git a/src/openrct2-ui/windows/PatrolArea.cpp b/src/openrct2-ui/windows/PatrolArea.cpp index f140d78621..2446b94d2b 100644 --- a/src/openrct2-ui/windows/PatrolArea.cpp +++ b/src/openrct2-ui/windows/PatrolArea.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/SceneryScatter.cpp b/src/openrct2-ui/windows/SceneryScatter.cpp index f167a0ee26..c3d304df01 100644 --- a/src/openrct2-ui/windows/SceneryScatter.cpp +++ b/src/openrct2-ui/windows/SceneryScatter.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index e79a212f2e..44282c15b6 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index 989f3ac92e..373efd11a9 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2/drawing/Drawing.Sprite.cpp b/src/openrct2/drawing/Drawing.Sprite.cpp index 27106c4a03..e0837e580c 100644 --- a/src/openrct2/drawing/Drawing.Sprite.cpp +++ b/src/openrct2/drawing/Drawing.Sprite.cpp @@ -175,7 +175,7 @@ static void ReadAndConvertGxDat(IStream* stream, size_t count, bool is_rctc, G1E // the change. This reverts the offsets to their RCT2 values. for (const auto& animation : sprite_peep_pickup_starts) { - for (int i = 0; i < SPR_PEEP_PICKUP_COUNT; ++i) + for (auto i = 0u; i < SPR_PEEP_PICKUP_COUNT; ++i) { elements[animation.start + i].x_offset -= animation.x_offset; elements[animation.start + i].y_offset -= animation.y_offset; diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp index 02c3e18631..183c4a24f9 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -286,7 +286,7 @@ void FontSpriteInitialiseCharacters() for (const auto& fontStyle : FontStyles) { int32_t glyphOffset = EnumValue(fontStyle) * SPR_G2_GLYPH_COUNT; - for (int32_t glyphIndex = 0; glyphIndex < SPR_G2_GLYPH_COUNT; glyphIndex++) + for (auto glyphIndex = 0u; glyphIndex < SPR_G2_GLYPH_COUNT; glyphIndex++) { const G1Element* g1 = GfxGetG1Element(glyphIndex + SPR_G2_CHAR_BEGIN + glyphOffset); int32_t width = 0; diff --git a/src/openrct2/drawing/ImageId.hpp b/src/openrct2/drawing/ImageId.hpp index 27be7d175e..5859998065 100644 --- a/src/openrct2/drawing/ImageId.hpp +++ b/src/openrct2/drawing/ImageId.hpp @@ -9,13 +9,14 @@ #pragma once +#include "ImageIndexType.h" + #include #include #include using colour_t = uint8_t; enum class FilterPaletteID : int32_t; -typedef uint32_t ImageIndex; static constexpr ImageIndex ImageIndexUndefined = std::numeric_limits::max(); diff --git a/src/openrct2/drawing/ImageIndexType.h b/src/openrct2/drawing/ImageIndexType.h new file mode 100644 index 0000000000..04161f2a5d --- /dev/null +++ b/src/openrct2/drawing/ImageIndexType.h @@ -0,0 +1,17 @@ +/***************************************************************************** + * 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 + +#include +#include + +using ImageIndex = uint32_t; + +constexpr ImageIndex kSpriteIdNull = std::numeric_limits::max(); diff --git a/src/openrct2/drawing/ScrollingText.cpp b/src/openrct2/drawing/ScrollingText.cpp index ad6e8a1c68..bde223f19a 100644 --- a/src/openrct2/drawing/ScrollingText.cpp +++ b/src/openrct2/drawing/ScrollingText.cpp @@ -1444,7 +1444,7 @@ ImageId ScrollingTextSetup( _drawSCrollNextIndex++; ft.Rewind(); - int32_t scrollIndex = ScrollingTextGetMatchingOrOldest(stringId, ft, scroll, scrollingMode, colour); + uint32_t scrollIndex = ScrollingTextGetMatchingOrOldest(stringId, ft, scroll, scrollingMode, colour); if (scrollIndex >= SPR_SCROLLING_TEXT_START) return ImageId(scrollIndex); diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 213862b96b..4bbc7c8ac3 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -49,6 +49,7 @@ #include "../scenario/Scenario.h" #include "../scripting/HookEngine.h" #include "../scripting/ScriptEngine.h" +#include "../sprites.h" #include "../util/Math.hpp" #include "../windows/Intent.h" #include "../world/Climate.h" diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index df233215f7..009eb229b8 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -26,7 +26,6 @@ #include "../platform/Platform.h" #include "../ride/RideAudio.h" #include "../scenario/Scenario.h" -#include "../sprites.h" #include "../ui/UiContext.h" #include "../ui/WindowManager.h" #include "../world/Map.h" diff --git a/src/openrct2/object/Object.h b/src/openrct2/object/Object.h index dac0f12964..d500bd752b 100644 --- a/src/openrct2/object/Object.h +++ b/src/openrct2/object/Object.h @@ -11,6 +11,7 @@ #include "../core/JsonFwd.hpp" #include "../core/String.hpp" +#include "../drawing/ImageIndexType.h" #include "../util/Util.h" #include "ImageTable.h" #include "ObjectAsset.h" diff --git a/src/openrct2/paint/tile_element/Paint.Banner.cpp b/src/openrct2/paint/tile_element/Paint.Banner.cpp index d76360a3de..79e987d9e8 100644 --- a/src/openrct2/paint/tile_element/Paint.Banner.cpp +++ b/src/openrct2/paint/tile_element/Paint.Banner.cpp @@ -20,7 +20,6 @@ #include "../../object/ObjectEntryManager.h" #include "../../profiling/Profiling.h" #include "../../ride/TrackDesign.h" -#include "../../sprites.h" #include "../../world/Banner.h" #include "../../world/Scenery.h" #include "../../world/TileInspector.h" diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index 3f3e6d1a71..d5df5efd69 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -23,6 +23,7 @@ #include "../../profiling/Profiling.h" #include "../../ride/RideData.h" #include "../../ride/TrackDesign.h" +#include "../../sprites.h" #include "../../world/Banner.h" #include "../../world/Entrance.h" #include "../../world/Footpath.h" diff --git a/src/openrct2/paint/vehicle/VehiclePaint.cpp b/src/openrct2/paint/vehicle/VehiclePaint.cpp index 096c24dc55..b9c45bd2f7 100644 --- a/src/openrct2/paint/vehicle/VehiclePaint.cpp +++ b/src/openrct2/paint/vehicle/VehiclePaint.cpp @@ -21,6 +21,7 @@ #include "../../ride/RideData.h" #include "../../ride/Track.h" #include "../../ride/Vehicle.h" +#include "../../sprites.h" #include "../Paint.h" #include diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index 20b1163069..3c9a76fcf9 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -21,9 +21,9 @@ #include "../audio/audio.h" #include "../core/BitSet.hpp" +#include "../drawing/ImageIndexType.h" #include "../entity/Guest.h" #include "../localisation/StringIds.h" -#include "../sprites.h" #include "../util/Util.h" #include "Ride.h" #include "RideAudio.h" @@ -580,7 +580,7 @@ constexpr RideTypeDescriptor DummyRTD = .PhotoItem = ShopItem::Photo, .BonusValue = 0, .ColourPresets = DEFAULT_FLAT_RIDE_COLOUR_PRESET, - .ColourPreview = { static_cast(SPR_NONE), static_cast(SPR_NONE) }, + .ColourPreview = { kSpriteIdNull, kSpriteIdNull }, .ColourKey = RideColourKey::Ride, .Name = "invalid", .RatingsData = diff --git a/src/openrct2/ride/rtd/coaster/AlpineCoaster.h b/src/openrct2/ride/rtd/coaster/AlpineCoaster.h index 8723c0394f..d3174a19e0 100644 --- a/src/openrct2/ride/rtd/coaster/AlpineCoaster.h +++ b/src/openrct2/ride/rtd/coaster/AlpineCoaster.h @@ -9,6 +9,7 @@ #pragma once +#include "../../../sprites.h" #include "../../RideData.h" #include "../../Track.h" diff --git a/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h index 870a51d345..f841424ec9 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h @@ -9,6 +9,7 @@ #pragma once +#include "../../../sprites.h" #include "../../RideData.h" #include "../../ShopItem.h" #include "../../Track.h" diff --git a/src/openrct2/ride/rtd/coaster/HybridCoaster.h b/src/openrct2/ride/rtd/coaster/HybridCoaster.h index f1d5817c5a..4f6f02e720 100644 --- a/src/openrct2/ride/rtd/coaster/HybridCoaster.h +++ b/src/openrct2/ride/rtd/coaster/HybridCoaster.h @@ -9,6 +9,7 @@ #pragma once +#include "../../../sprites.h" #include "../../RideData.h" #include "../../Track.h" diff --git a/src/openrct2/ride/rtd/coaster/HyperTwister.h b/src/openrct2/ride/rtd/coaster/HyperTwister.h index f006d92917..3f6e34e01b 100644 --- a/src/openrct2/ride/rtd/coaster/HyperTwister.h +++ b/src/openrct2/ride/rtd/coaster/HyperTwister.h @@ -11,6 +11,7 @@ #include "../../../paint/support/MetalSupports.h" #include "../../../paint/track/coaster/BolligerMabillardTrack.hpp" +#include "../../../sprites.h" #include "../../RideData.h" #include "../../ShopItem.h" #include "../../Track.h" diff --git a/src/openrct2/ride/rtd/coaster/Hypercoaster.h b/src/openrct2/ride/rtd/coaster/Hypercoaster.h index 1c3f6f8c94..05c34df9e9 100644 --- a/src/openrct2/ride/rtd/coaster/Hypercoaster.h +++ b/src/openrct2/ride/rtd/coaster/Hypercoaster.h @@ -10,6 +10,7 @@ #pragma once #include "../../../paint/track/coaster/CorkscrewRollerCoaster.hpp" +#include "../../../sprites.h" #include "../../RideData.h" #include "../../ShopItem.h" #include "../../Track.h" diff --git a/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h index 4b8a19e4ac..b1ba56b511 100644 --- a/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h @@ -9,6 +9,7 @@ #pragma once +#include "../../../sprites.h" #include "../../RideData.h" #include "../../Track.h" diff --git a/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h b/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h index f91ad0ef84..82d73424f8 100644 --- a/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h @@ -9,6 +9,7 @@ #pragma once +#include "../../../sprites.h" #include "../../RideData.h" #include "../../ShopItem.h" #include "../../Track.h" diff --git a/src/openrct2/ride/rtd/gentle/MonsterTrucks.h b/src/openrct2/ride/rtd/gentle/MonsterTrucks.h index 790bc6828a..464ab02941 100644 --- a/src/openrct2/ride/rtd/gentle/MonsterTrucks.h +++ b/src/openrct2/ride/rtd/gentle/MonsterTrucks.h @@ -10,6 +10,7 @@ #pragma once #include "../../../drawing/LightFX.h" +#include "../../../sprites.h" #include "../../RideData.h" #include "../../ShopItem.h" #include "../../Track.h" diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 29a5f1cc5c..1adf4c0bef 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -9,13 +9,12 @@ #pragma once +#include "drawing/ImageIndexType.h" #include "drawing/ScrollingText.h" #include "rct1/Limits.h" -enum +enum : ImageIndex { - SPR_NONE = -1, // 0x7FFFF - // Used for on-demand drawing of dynamic memory SPR_TEMP = 0x7FFFE,