From 0bfeff59ba224540e281e038448012aeb9b70f31 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 7 Mar 2025 22:41:04 +0100 Subject: [PATCH] Create weak enum for MazeWallType --- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/rct1/T4Importer.cpp | 2 +- src/openrct2/ride/Ride.h | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 145fc2a5cc..9bafe64659 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1219,7 +1219,7 @@ namespace OpenRCT2::RCT1 if (src->type == RideType::HedgeMaze) { if (_gameVersion < FILE_VERSION_RCT1_LL || src->trackColourSupports[0] > 3) - dst->trackColours[0].supports = MAZE_WALL_TYPE_HEDGE; + dst->trackColours[0].supports = MazeWallType::hedges; else dst->trackColours[0].supports = src->trackColourSupports[0]; } diff --git a/src/openrct2/rct1/T4Importer.cpp b/src/openrct2/rct1/T4Importer.cpp index aa362f59bd..5ac93fc716 100644 --- a/src/openrct2/rct1/T4Importer.cpp +++ b/src/openrct2/rct1/T4Importer.cpp @@ -115,7 +115,7 @@ namespace OpenRCT2::RCT1 // Mazes were only hedges if (td4.Type == RideType::HedgeMaze) { - td->appearance.trackColours[i].supports = MAZE_WALL_TYPE_HEDGE; + td->appearance.trackColours[i].supports = MazeWallType::hedges; } else if (td4.Type == RideType::RiverRapids) { diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 021bc36032..fb22bdc634 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -823,12 +823,12 @@ enum RIDE_CRASH_TYPE_FATALITIES = 8 }; -enum +enum MazeWallType : uint8_t { - MAZE_WALL_TYPE_BRICK, - MAZE_WALL_TYPE_HEDGE, - MAZE_WALL_TYPE_ICE, - MAZE_WALL_TYPE_WOOD, + brick, + hedges, + ice, + wooden, }; enum