From a1cbaf9a468cd848688d99749a2f777f62a53ab4 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 27 Apr 2020 18:57:34 +0200 Subject: [PATCH] Use OBJECT_ENTRY_INDEX_NULL in more places --- src/openrct2-ui/windows/Land.cpp | 16 ++++++++-------- src/openrct2-ui/windows/MapGen.cpp | 8 ++++---- src/openrct2-ui/windows/Scenery.cpp | 2 +- src/openrct2/actions/SurfaceSetStyleAction.hpp | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index 1cdb5b9e2b..7a1874a80e 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -121,8 +121,8 @@ rct_window* window_land_open() window_push_others_below(window); gLandToolSize = 1; - gLandToolTerrainSurface = 255; - gLandToolTerrainEdge = 255; + gLandToolTerrainSurface = OBJECT_ENTRY_INDEX_NULL; + gLandToolTerrainEdge = OBJECT_ENTRY_INDEX_NULL; gLandMountainMode = false; gLandPaintMode = false; _selectedFloorTexture = TERRAIN_GRASS; @@ -223,7 +223,7 @@ static void window_land_dropdown(rct_window* w, rct_widgetindex widgetIndex, int if (gLandToolTerrainSurface == type) { - gLandToolTerrainSurface = 255; + gLandToolTerrainSurface = OBJECT_ENTRY_INDEX_NULL; } else { @@ -240,7 +240,7 @@ static void window_land_dropdown(rct_window* w, rct_widgetindex widgetIndex, int if (gLandToolTerrainEdge == type) { - gLandToolTerrainEdge = 255; + gLandToolTerrainEdge = OBJECT_ENTRY_INDEX_NULL; } else { @@ -316,9 +316,9 @@ static void window_land_invalidate(rct_window* w) } w->pressed_widgets = (1 << WIDX_PREVIEW); - if (gLandToolTerrainSurface != 255) + if (gLandToolTerrainSurface != OBJECT_ENTRY_INDEX_NULL) w->pressed_widgets |= (1 << WIDX_FLOOR); - if (gLandToolTerrainEdge != 255) + if (gLandToolTerrainEdge != OBJECT_ENTRY_INDEX_NULL) w->pressed_widgets |= (1 << WIDX_WALL); if (gLandMountainMode) w->pressed_widgets |= (1 << WIDX_MOUNTAINMODE); @@ -378,7 +378,7 @@ static void window_land_paint(rct_window* w, rct_drawpixelinfo* dpi) // Draw paint price numTiles = gLandToolSize * gLandToolSize; price = 0; - if (gLandToolTerrainSurface != 255) + if (gLandToolTerrainSurface != OBJECT_ENTRY_INDEX_NULL) { auto& objManager = GetContext()->GetObjectManager(); const auto surfaceObj = static_cast( @@ -389,7 +389,7 @@ static void window_land_paint(rct_window* w, rct_drawpixelinfo* dpi) } } - if (gLandToolTerrainEdge != 255) + if (gLandToolTerrainEdge != OBJECT_ENTRY_INDEX_NULL) price += numTiles * 100; if (price != 0) diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index b9c856578a..2a828dba7d 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -661,7 +661,7 @@ static void window_mapgen_base_dropdown(rct_window* w, rct_widgetindex widgetInd if (gLandToolTerrainSurface == type) { - gLandToolTerrainSurface = 255; + gLandToolTerrainSurface = OBJECT_ENTRY_INDEX_NULL; } else { @@ -678,7 +678,7 @@ static void window_mapgen_base_dropdown(rct_window* w, rct_widgetindex widgetInd if (gLandToolTerrainEdge == type) { - gLandToolTerrainEdge = 255; + gLandToolTerrainEdge = OBJECT_ENTRY_INDEX_NULL; } else { @@ -998,7 +998,7 @@ static void window_mapgen_simplex_dropdown(rct_window* w, rct_widgetindex widget if (gLandToolTerrainSurface == type) { - gLandToolTerrainSurface = 255; + gLandToolTerrainSurface = OBJECT_ENTRY_INDEX_NULL; } else { @@ -1015,7 +1015,7 @@ static void window_mapgen_simplex_dropdown(rct_window* w, rct_widgetindex widget if (gLandToolTerrainEdge == type) { - gLandToolTerrainEdge = 255; + gLandToolTerrainEdge = OBJECT_ENTRY_INDEX_NULL; } else { diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 993c3733ba..89103ad7da 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -203,7 +203,7 @@ static void init_scenery_entry(rct_scenery_entry* sceneryEntry, const ScenerySel Guard::ArgumentInRange(selection.EntryIndex, 0, WINDOW_SCENERY_TAB_SELECTION_UNDEFINED); if (scenery_is_invented(selection) || gCheatsIgnoreResearchStatus) { - if (sceneryTabId != 0xFF) + if (sceneryTabId != OBJECT_ENTRY_INDEX_NULL) { for (int32_t i = 0; i < SCENERY_ENTRIES_PER_TAB; i++) { diff --git a/src/openrct2/actions/SurfaceSetStyleAction.hpp b/src/openrct2/actions/SurfaceSetStyleAction.hpp index 67dfc0a48a..0381bef854 100644 --- a/src/openrct2/actions/SurfaceSetStyleAction.hpp +++ b/src/openrct2/actions/SurfaceSetStyleAction.hpp @@ -61,7 +61,7 @@ public: MapRange validRange{ x0, y0, x1, y1 }; auto& objManager = OpenRCT2::GetContext()->GetObjectManager(); - if (_surfaceStyle != 0xFF) + if (_surfaceStyle != OBJECT_ENTRY_INDEX_NULL) { if (_surfaceStyle > 0x1F) { @@ -79,7 +79,7 @@ public: } } - if (_edgeStyle != 0xFF) + if (_edgeStyle != OBJECT_ENTRY_INDEX_NULL) { if (_edgeStyle > 0xF) { @@ -131,7 +131,7 @@ public: continue; } - if (_surfaceStyle != 0xFF) + if (_surfaceStyle != OBJECT_ENTRY_INDEX_NULL) { uint8_t curSurfaceStyle = surfaceElement->GetSurfaceStyle(); @@ -146,7 +146,7 @@ public: } } - if (_edgeStyle != 0xFF) + if (_edgeStyle != OBJECT_ENTRY_INDEX_NULL) { uint8_t curEdgeStyle = surfaceElement->GetEdgeStyle(); @@ -203,7 +203,7 @@ public: continue; } - if (_surfaceStyle != 0xFF) + if (_surfaceStyle != OBJECT_ENTRY_INDEX_NULL) { uint8_t curSurfaceStyle = surfaceElement->GetSurfaceStyle(); @@ -224,7 +224,7 @@ public: } } - if (_edgeStyle != 0xFF) + if (_edgeStyle != OBJECT_ENTRY_INDEX_NULL) { uint8_t curEdgeStyle = surfaceElement->GetEdgeStyle();