From 99626e4fbb55c33a7eb2acbf032c763752213fb3 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 27 Apr 2020 17:57:50 +0200 Subject: [PATCH] Convert RCT12 research marker defines to constexpr --- src/openrct2/rct12/RCT12.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openrct2/rct12/RCT12.h b/src/openrct2/rct12/RCT12.h index a6c97bcb9e..d773c20c04 100644 --- a/src/openrct2/rct12/RCT12.h +++ b/src/openrct2/rct12/RCT12.h @@ -58,11 +58,11 @@ constexpr const uint8_t RCT12_TILE_ELEMENT_SURFACE_TERRAIN_MASK = 0xE0; // constexpr uint16_t const RCT12_XY8_UNDEFINED = 0xFFFF; // Everything before this point has been researched -#define RCT12_RESEARCHED_ITEMS_SEPARATOR 0xFFFFFFFF +constexpr const uint32_t RCT12_RESEARCHED_ITEMS_SEPARATOR = 0xFFFFFFFF; // Everything before this point and after separator still requires research -#define RCT12_RESEARCHED_ITEMS_END 0xFFFFFFFE +constexpr const uint32_t RCT12_RESEARCHED_ITEMS_END = 0xFFFFFFFE; // Extra end of list entry. Leftover from RCT1. -#define RCT12_RESEARCHED_ITEMS_END_2 0xFFFFFFFD +constexpr const uint32_t RCT12_RESEARCHED_ITEMS_END_2 = 0xFFFFFFFD; enum class RCT12TrackDesignVersion : uint8_t {