mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 22:13:07 +01:00
Code Issues Releases Wiki Activity

Rename many RCT12 constants

Browse Source
This commit is contained in:
Gymnasiast
2025-03-26 12:33:40 +01:00
parent 80dc039b26
commit fb75de8245
7 changed files with 82 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/openrct2/park/ParkFile.cpp
View File

@@ -1012,12 +1012,12 @@ namespace OpenRCT2
});
for (int i = 0; i < kParkRatingHistorySize; i++)
{
if (smallHistory[i] == RCT12ParkHistoryUndefined)
if (smallHistory[i] == kRCT12ParkHistoryUndefined)
gameState.park.RatingHistory[i] = kParkRatingHistoryUndefined;
else
{
gameState.park.RatingHistory[i] = static_cast<uint16_t>(
smallHistory[i] * RCT12ParkRatingHistoryFactor);
smallHistory[i] * kRCT12ParkRatingHistoryFactor);
}
}
}
@@ -1027,11 +1027,11 @@ namespace OpenRCT2
for (int i = 0; i < kParkRatingHistorySize; i++)
{
if (gameState.park.RatingHistory[i] == kParkRatingHistoryUndefined)
smallHistory[i] = RCT12ParkHistoryUndefined;
smallHistory[i] = kRCT12ParkHistoryUndefined;
else
{
smallHistory[i] = static_cast<uint8_t>(
gameState.park.RatingHistory[i] / RCT12ParkRatingHistoryFactor);
gameState.park.RatingHistory[i] / kRCT12ParkRatingHistoryFactor);
}
}
cs.ReadWriteArray(smallHistory, [&cs](uint8_t& value) {
@@ -1237,12 +1237,11 @@ namespace OpenRCT2
// Previous formats stored the needs supports flag in the primary colour
// We have moved it into a flags field to support extended colour sets
bool needsSupports = sceneryElement->GetPrimaryColour()
& RCT12_SMALL_SCENERY_ELEMENT_NEEDS_SUPPORTS_FLAG;
& kRCT12SmallSceneryElementNeedsSupportsFlag;
if (needsSupports)
{
sceneryElement->SetPrimaryColour(
sceneryElement->GetPrimaryColour()
& ~RCT12_SMALL_SCENERY_ELEMENT_NEEDS_SUPPORTS_FLAG);
sceneryElement->GetPrimaryColour() & ~kRCT12SmallSceneryElementNeedsSupportsFlag);
sceneryElement->SetNeedsSupports();
}
}

2
src/openrct2/rct1/RCT1.h
View File

@@ -505,7 +505,7 @@ namespace OpenRCT2::RCT1
uint8_t GetTrackDirection() const
{
return TrackTypeAndDirection & RCT12VehicleTrackDirectionMask;
return TrackTypeAndDirection & kRCT12VehicleTrackDirectionMask;
}
};

14
src/openrct2/rct1/S4Importer.cpp
View File

@@ -1229,7 +1229,7 @@ namespace OpenRCT2::RCT1
{
for (const auto& src : _s4.RideMeasurements)
{
if (src.RideIndex != RCT12_RIDE_ID_NULL)
if (src.RideIndex != kRCT12RideIdNull)
{
auto ride = GetRide(RCT12RideIdToOpenRCT2RideId(src.RideIndex));
if (ride != nullptr)
@@ -1464,7 +1464,7 @@ namespace OpenRCT2::RCT1
gameState.peepSpawns.clear();
for (size_t i = 0; i < Limits::kMaxPeepSpawns; i++)
{
if (_s4.PeepSpawn[i].x != RCT12_PEEP_SPAWN_UNDEFINED)
if (_s4.PeepSpawn[i].x != kRCT12PeepSpawnUndefined)
{
PeepSpawn spawn = { _s4.PeepSpawn[i].x, _s4.PeepSpawn[i].y, _s4.PeepSpawn[i].z * 16,
_s4.PeepSpawn[i].direction };
@@ -2245,16 +2245,16 @@ namespace OpenRCT2::RCT1
Park::ResetHistories(gameState);
for (size_t i = 0; i < std::size(_s4.ParkRatingHistory); i++)
{
if (_s4.ParkRatingHistory[i] != RCT12ParkHistoryUndefined)
if (_s4.ParkRatingHistory[i] != kRCT12ParkHistoryUndefined)
{
gameState.park.RatingHistory[i] = _s4.ParkRatingHistory[i] * RCT12ParkRatingHistoryFactor;
gameState.park.RatingHistory[i] = _s4.ParkRatingHistory[i] * kRCT12ParkRatingHistoryFactor;
}
}
for (size_t i = 0; i < std::size(_s4.GuestsInParkHistory); i++)
{
if (_s4.GuestsInParkHistory[i] != RCT12ParkHistoryUndefined)
if (_s4.GuestsInParkHistory[i] != kRCT12ParkHistoryUndefined)
{
gameState.guestsInParkHistory[i] = _s4.GuestsInParkHistory[i] * RCT12GuestsInParkHistoryFactor;
gameState.guestsInParkHistory[i] = _s4.GuestsInParkHistory[i] * kRCT12GuestsInParkHistoryFactor;
}
}
@@ -2944,7 +2944,7 @@ namespace OpenRCT2::RCT1
auto srcThought = &src->Thoughts[i];
auto dstThought = &dst->Thoughts[i];
dstThought->type = static_cast<PeepThoughtType>(srcThought->Type);
if (srcThought->Item == RCT12PeepThoughtItemNone)
if (srcThought->Item == kRCT12PeepThoughtItemNone)
dstThought->item = kPeepThoughtItemNone;
else
dstThought->item = srcThought->Item;

42
src/openrct2/rct12/RCT12.cpp
View File

@@ -83,7 +83,7 @@ uint8_t RCT12SurfaceElement::GetSlope() const
uint32_t RCT12SurfaceElement::GetSurfaceStyle() const
{
uint32_t retVal = (Terrain >> 5) & 7;
retVal |= (Type & RCT12_SURFACE_ELEMENT_TYPE_SURFACE_MASK) << 3;
retVal |= (Type & kRCT12SurfaceElementTypeSurfaceMask) << 3;
return retVal;
}
@@ -107,7 +107,7 @@ uint8_t RCT12SurfaceElement::GetOwnership() const
uint32_t RCT12SurfaceElement::GetWaterHeight() const
{
return (Terrain & RCT12_TILE_ELEMENT_SURFACE_WATER_HEIGHT_MASK) * kWaterHeightStep;
return (Terrain & kRCT12SurfaceElementWaterHeightMask) * kWaterHeightStep;
}
uint8_t RCT12SurfaceElement::GetParkFences() const
@@ -234,7 +234,7 @@ uint8_t RCT12TrackElement::GetStationIndex() const
bool RCT12TrackElement::HasChain() const
{
return Type & RCT12_TRACK_ELEMENT_TYPE_FLAG_CHAIN_LIFT;
return Type & kRCT12TrackElementTypeFlagChainLift;
}
bool RCT12TrackElement::HasCableLift() const
@@ -260,7 +260,7 @@ bool RCT12TrackElement::HasGreenLight() const
{
if (TrackTypeIsStation(TrackType))
{
return (Sequence & MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT) != 0;
return (Sequence & kRCT12TrackElementSequenceGreenLight) != 0;
}
return false;
}
@@ -316,22 +316,22 @@ uint8_t RCT12SmallSceneryElement::GetSceneryQuadrant() const
colour_t RCT12SmallSceneryElement::GetPrimaryColour() const
{
return Colour1 & RCT12_TILE_ELEMENT_COLOUR_MASK;
return Colour1 & kRCT12TileElementColourMask;
}
colour_t RCT12SmallSceneryElement::GetSecondaryColour() const
{
return Colour2 & RCT12_TILE_ELEMENT_COLOUR_MASK;
return Colour2 & kRCT12TileElementColourMask;
}
bool RCT12SmallSceneryElement::NeedsSupports() const
{
return Colour1 & RCT12_SMALL_SCENERY_ELEMENT_NEEDS_SUPPORTS_FLAG;
return Colour1 & kRCT12SmallSceneryElementNeedsSupportsFlag;
}
uint32_t RCT12LargeSceneryElement::GetEntryIndex() const
{
return EntryIndex & RCT12_TILE_ELEMENT_LARGE_TYPE_MASK;
return EntryIndex & kRCT12TileElementLargeTypeMask;
}
uint16_t RCT12LargeSceneryElement::GetSequenceIndex() const
@@ -340,18 +340,18 @@ uint16_t RCT12LargeSceneryElement::GetSequenceIndex() const
}
colour_t RCT12LargeSceneryElement::GetPrimaryColour() const
{
return Colour[0] & RCT12_TILE_ELEMENT_COLOUR_MASK;
return Colour[0] & kRCT12TileElementColourMask;
}
colour_t RCT12LargeSceneryElement::GetSecondaryColour() const
{
return Colour[1] & RCT12_TILE_ELEMENT_COLOUR_MASK;
return Colour[1] & kRCT12TileElementColourMask;
}
uint8_t RCT12LargeSceneryElement::GetBannerIndex() const
{
return (Type & 0xC0) | (((Colour[0]) & ~RCT12_TILE_ELEMENT_COLOUR_MASK) >> 2)
| (((Colour[1]) & ~RCT12_TILE_ELEMENT_COLOUR_MASK) >> 5);
return (Type & 0xC0) | (((Colour[0]) & ~kRCT12TileElementColourMask) >> 2)
| (((Colour[1]) & ~kRCT12TileElementColourMask) >> 5);
}
uint8_t RCT12WallElement::GetEntryIndex() const
@@ -366,19 +366,19 @@ uint8_t RCT12WallElement::GetSlope() const
colour_t RCT12WallElement::GetPrimaryColour() const
{
return Colour1 & RCT12_TILE_ELEMENT_COLOUR_MASK;
return Colour1 & kRCT12TileElementColourMask;
}
colour_t RCT12WallElement::GetSecondaryColour() const
{
uint8_t secondaryColour = (Colour1 & ~RCT12_TILE_ELEMENT_COLOUR_MASK) >> 5;
uint8_t secondaryColour = (Colour1 & ~kRCT12TileElementColourMask) >> 5;
secondaryColour |= (Flags & 0x60) >> 2;
return secondaryColour;
}
colour_t RCT12WallElement::GetTertiaryColour() const
{
return Colour3 & RCT12_TILE_ELEMENT_COLOUR_MASK;
return Colour3 & kRCT12TileElementColourMask;
}
uint8_t RCT12WallElement::GetAnimationFrame() const
@@ -496,17 +496,17 @@ bool RCT12TrackElement::BlockBrakeClosed() const
bool RCT12ResearchItem::IsInventedEndMarker() const
{
return RawValue == RCT12_RESEARCHED_ITEMS_SEPARATOR;
return RawValue == kRCT12ResearchedItemsSeparator;
}
bool RCT12ResearchItem::IsUninventedEndMarker() const
{
return RawValue == RCT12_RESEARCHED_ITEMS_END;
return RawValue == kRCT12ResearchedItemsEnd;
}
bool RCT12ResearchItem::IsRandomEndMarker() const
{
return RawValue == RCT12_RESEARCHED_ITEMS_END_2;
return RawValue == kRCT12ResearchedItemsEnd2;
}
ObjectEntryIndex RCTEntryIndexToOpenRCT2EntryIndex(const RCT12ObjectEntryIndex index)
@@ -519,7 +519,7 @@ ObjectEntryIndex RCTEntryIndexToOpenRCT2EntryIndex(const RCT12ObjectEntryIndex i
RideId RCT12RideIdToOpenRCT2RideId(const RCT12RideId rideId)
{
if (rideId == RCT12_RIDE_ID_NULL)
if (rideId == kRCT12RideIdNull)
return RideId::GetNull();
return RideId::FromUnderlying(rideId);
@@ -527,11 +527,11 @@ RideId RCT12RideIdToOpenRCT2RideId(const RCT12RideId rideId)
static bool RCT12IsFormatChar(codepoint_t c)
{
if (c >= RCT2_STRING_FORMAT_ARG_START && c <= RCT2_STRING_FORMAT_ARG_END)
if (c >= kRCT12StringFormatArgStart && c <= kRCT12StringFormatArgEnd)
{
return true;
}
if (c >= RCT2_STRING_FORMAT_COLOUR_START && c <= RCT2_STRING_FORMAT_COLOUR_END)
if (c >= kRCT12StringFormatColourStart && c <= kRCT12StringFormatColourEnd)
{
return true;
}

73
src/openrct2/rct12/RCT12.h
View File

@@ -320,54 +320,54 @@ namespace OpenRCT2::RCT12
};
} // namespace OpenRCT2::RCT12
enum
{
MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT = (1 << 7),
};
constexpr uint8_t kRCT12StringFormatArgStart = 123;
constexpr uint8_t kRCT12StringFormatArgEnd = 141;
constexpr uint8_t kRCT12StringFormatColourStart = 142;
constexpr uint8_t kRCT12StringFormatColourEnd = 156;
constexpr uint8_t RCT2_STRING_FORMAT_ARG_START = 123;
constexpr uint8_t RCT2_STRING_FORMAT_ARG_END = 141;
constexpr uint8_t RCT2_STRING_FORMAT_COLOUR_START = 142;
constexpr uint8_t RCT2_STRING_FORMAT_COLOUR_END = 156;
constexpr uint8_t RCT12_SOUND_ID_NULL = 0xFF;
constexpr uint8_t kRCT12SoundIdNull = 0xFF;
using RCT12RideId = uint8_t;
constexpr RCT12RideId RCT12_RIDE_ID_NULL = 255;
constexpr RCT12RideId kRCT12RideIdNull = 255;
constexpr uint8_t RCT12_BANNER_INDEX_NULL = std::numeric_limits<uint8_t>::max();
constexpr uint8_t kRCT12BannerIndexNull = std::numeric_limits<uint8_t>::max();
constexpr uint8_t RCT12_TILE_ELEMENT_SURFACE_EDGE_STYLE_MASK = 0xE0; // in RCT12TileElement.properties.surface.slope
constexpr uint8_t RCT12_TILE_ELEMENT_SURFACE_WATER_HEIGHT_MASK = 0x1F; // in RCT12TileElement.properties.surface.terrain
constexpr uint8_t RCT12_TILE_ELEMENT_SURFACE_TERRAIN_MASK = 0xE0; // in RCT12TileElement.properties.surface.terrain
constexpr uint8_t kRCT12SurfaceElementEdgeStyleMask = 0xE0; // in RCT12TileElement.properties.surface.slope
constexpr uint8_t kRCT12SurfaceElementWaterHeightMask = 0x1F; // in RCT12TileElement.properties.surface.terrain
constexpr uint8_t kRCT12SurfaceElementTerrainMask = 0xE0; // in RCT12TileElement.properties.surface.terrain
constexpr uint8_t kRCT12SurfaceElementTypeSurfaceMask = 0b00000011; // in RCT12TileElement.properties.surface.type
constexpr uint8_t kRCT12SurfaceElementTypeEdgeMask = 0b01000000; // in RCT12TileElement.properties.surface.type
constexpr uint8_t RCT12_SMALL_SCENERY_ELEMENT_NEEDS_SUPPORTS_FLAG = 0x20;
constexpr uint8_t RCT12_TILE_ELEMENT_COLOUR_MASK = 0b0001'1111;
constexpr uint8_t kRCT12SmallSceneryElementNeedsSupportsFlag = 0x20;
constexpr uint8_t kRCT12TileElementColourMask = 0b0001'1111;
constexpr uint16_t RCT12_TILE_ELEMENT_LARGE_TYPE_MASK = 0x3FF;
constexpr uint16_t kRCT12TileElementLargeTypeMask = 0x3FF;
constexpr uint16_t const RCT12_XY8_UNDEFINED = 0xFFFF;
constexpr uint8_t kRCT12TrackElementTypeFlagChainLift = 1 << 7;
constexpr uint8_t kRCT12TrackElementSequenceGreenLight = 1 << 7;
constexpr uint16_t const kRCT12xy8Undefined = 0xFFFF;
using RCT12ObjectEntryIndex = uint8_t;
constexpr RCT12ObjectEntryIndex kRCT12ObjectEntryIndexNull = 255;
// Everything before this point has been researched
constexpr uint32_t RCT12_RESEARCHED_ITEMS_SEPARATOR = 0xFFFFFFFF;
constexpr uint32_t kRCT12ResearchedItemsSeparator = 0xFFFFFFFF;
// Everything before this point and after separator still requires research
constexpr uint32_t RCT12_RESEARCHED_ITEMS_END = 0xFFFFFFFE;
constexpr uint32_t kRCT12ResearchedItemsEnd = 0xFFFFFFFE;
// Extra end of list entry. Leftover from RCT1.
constexpr uint32_t RCT12_RESEARCHED_ITEMS_END_2 = 0xFFFFFFFD;
constexpr uint32_t kRCT12ResearchedItemsEnd2 = 0xFFFFFFFD;
constexpr uint16_t RCT12_PEEP_SPAWN_UNDEFINED = 0xFFFF;
constexpr uint16_t kRCT12PeepSpawnUndefined = 0xFFFF;
constexpr uint16_t RCT12VehicleTrackDirectionMask = 0b0000000000000011;
constexpr uint16_t RCT12VehicleTrackTypeMask = 0b1111111111111100;
constexpr uint16_t kRCT12VehicleTrackDirectionMask = 0b0000000000000011;
constexpr uint16_t kRCT12VehicleTrackTypeMask = 0b1111111111111100;
constexpr uint8_t RCT12PeepThoughtItemNone = std::numeric_limits<uint8_t>::max();
constexpr uint8_t kRCT12PeepThoughtItemNone = std::numeric_limits<uint8_t>::max();
constexpr uint8_t RCT12GuestsInParkHistoryFactor = 20;
constexpr uint8_t RCT12ParkRatingHistoryFactor = 4;
constexpr uint8_t RCT12ParkHistoryUndefined = std::numeric_limits<uint8_t>::max();
constexpr uint8_t kRCT12GuestsInParkHistoryFactor = 20;
constexpr uint8_t kRCT12ParkRatingHistoryFactor = 4;
constexpr uint8_t kRCT12ParkHistoryUndefined = std::numeric_limits<uint8_t>::max();
constexpr uint8_t kTD46RatingsMultiplier = 10;
constexpr uint8_t kTD46GForcesMultiplier = 32;
@@ -387,12 +387,6 @@ enum class RCT12TrackDesignVersion : uint8_t
unknown
};
enum
{
RCT12_SURFACE_ELEMENT_TYPE_SURFACE_MASK = 0b00000011,
RCT12_SURFACE_ELEMENT_TYPE_EDGE_MASK = 0b01000000,
};
enum
{
RCT12_TILE_ELEMENT_FLAG_GHOST = (1 << 4),
@@ -404,11 +398,6 @@ enum
RCT12_TILE_ELEMENT_FLAG_LAST_TILE = (1 << 7)
};
enum
{
RCT12_TRACK_ELEMENT_TYPE_FLAG_CHAIN_LIFT = 1 << 7,
};
enum
{
RCT12_TRACK_ELEMENT_SEQUENCE_STATION_INDEX_MASK = 0b01110000,
@@ -506,12 +495,12 @@ struct RCT12xy8
bool IsNull() const
{
return xy == RCT12_XY8_UNDEFINED;
return xy == kRCT12xy8Undefined;
}
void SetNull()
{
xy = RCT12_XY8_UNDEFINED;
xy = kRCT12xy8Undefined;
}
};
static_assert(sizeof(RCT12xy8) == 2);

8
src/openrct2/rct2/RCT2.h
View File

@@ -511,19 +511,19 @@ namespace OpenRCT2::RCT2
}
uint8_t GetTrackDirection() const
{
return TrackTypeAndDirection & RCT12VehicleTrackDirectionMask;
return TrackTypeAndDirection & kRCT12VehicleTrackDirectionMask;
}
void SetTrackType(OpenRCT2::RCT12::TrackElemType trackType)
{
// set the upper 14 bits to 0
TrackTypeAndDirection &= ~RCT12VehicleTrackTypeMask;
TrackTypeAndDirection &= ~kRCT12VehicleTrackTypeMask;
TrackTypeAndDirection |= EnumValue(trackType) << 2;
}
void SetTrackDirection(uint8_t trackDirection)
{
// set the lower 2 bits only
TrackTypeAndDirection &= ~RCT12VehicleTrackDirectionMask;
TrackTypeAndDirection |= trackDirection & RCT12VehicleTrackDirectionMask;
TrackTypeAndDirection &= ~kRCT12VehicleTrackDirectionMask;
TrackTypeAndDirection |= trackDirection & kRCT12VehicleTrackDirectionMask;
}
};
static_assert(sizeof(Vehicle) == 0xDA);

24
src/openrct2/rct2/S6Importer.cpp
View File

@@ -436,29 +436,29 @@ namespace OpenRCT2::RCT2
Park::ResetHistories(gameState);
for (size_t i = 0; i < std::size(_s6.ParkRatingHistory); i++)
{
if (_s6.ParkRatingHistory[i] != RCT12ParkHistoryUndefined)
if (_s6.ParkRatingHistory[i] != kRCT12ParkHistoryUndefined)
{
gameState.park.RatingHistory[i] = _s6.ParkRatingHistory[i] * RCT12ParkRatingHistoryFactor;
gameState.park.RatingHistory[i] = _s6.ParkRatingHistory[i] * kRCT12ParkRatingHistoryFactor;
}
}
for (size_t i = 0; i < std::size(_s6.GuestsInParkHistory); i++)
{
if (_s6.GuestsInParkHistory[i] != RCT12ParkHistoryUndefined)
if (_s6.GuestsInParkHistory[i] != kRCT12ParkHistoryUndefined)
{
gameState.guestsInParkHistory[i] = _s6.GuestsInParkHistory[i] * RCT12GuestsInParkHistoryFactor;
gameState.guestsInParkHistory[i] = _s6.GuestsInParkHistory[i] * kRCT12GuestsInParkHistoryFactor;
}
}
gameState.researchPriorities = _s6.ActiveResearchTypes;
gameState.researchProgressStage = _s6.ResearchProgressStage;
if (_s6.LastResearchedItemSubject != RCT12_RESEARCHED_ITEMS_SEPARATOR)
if (_s6.LastResearchedItemSubject != kRCT12ResearchedItemsSeparator)
gameState.researchLastItem = RCT12ResearchItem{ _s6.LastResearchedItemSubject,
EnumValue(ResearchCategory::Transport) }
.ToResearchItem();
else
gameState.researchLastItem = std::nullopt;
// Pad01357CF8
if (_s6.NextResearchItem != RCT12_RESEARCHED_ITEMS_SEPARATOR)
if (_s6.NextResearchItem != kRCT12ResearchedItemsSeparator)
gameState.researchNextItem = RCT12ResearchItem{ _s6.NextResearchItem, _s6.NextResearchCategory }
.ToResearchItem();
else
@@ -707,7 +707,7 @@ namespace OpenRCT2::RCT2
bool IsFlatRide(const uint8_t rct12RideIndex)
{
if (rct12RideIndex == RCT12_RIDE_ID_NULL)
if (rct12RideIndex == kRCT12RideIdNull)
return false;
return _isFlatRide[rct12RideIndex];
}
@@ -1060,7 +1060,7 @@ namespace OpenRCT2::RCT2
{
for (const auto& src : _s6.RideMeasurements)
{
if (src.RideIndex != RCT12_RIDE_ID_NULL)
if (src.RideIndex != kRCT12RideIdNull)
{
const auto rideId = RideId::FromUnderlying(src.RideIndex);
auto ride = GetRide(rideId);
@@ -1159,14 +1159,14 @@ namespace OpenRCT2::RCT2
|| String::equals(_s6.ScenarioFilename, "South America - Rio Carnival.SC6"))
{
_s6.PeepSpawns[0] = { 2160, 3167, 6, 1 };
_s6.PeepSpawns[1].x = RCT12_PEEP_SPAWN_UNDEFINED;
_s6.PeepSpawns[1].x = kRCT12PeepSpawnUndefined;
}
// In this park, peep_spawns[0] is correct. Just clear the other.
else if (
String::equals(_s6.ScenarioFilename, "Great Wall of China Tourism Enhancement.SC6")
|| String::equals(_s6.ScenarioFilename, "Asia - Great Wall of China Tourism Enhancement.SC6"))
{
_s6.PeepSpawns[1].x = RCT12_PEEP_SPAWN_UNDEFINED;
_s6.PeepSpawns[1].x = kRCT12PeepSpawnUndefined;
}
// Amity Airfield has peeps entering from the corner of the tile, instead of the middle.
else if (String::equals(_s6.ScenarioFilename, "Amity Airfield.SC6"))
@@ -1183,7 +1183,7 @@ namespace OpenRCT2::RCT2
gameState.peepSpawns.clear();
for (size_t i = 0; i < Limits::kMaxPeepSpawns; i++)
{
if (_s6.PeepSpawns[i].x != RCT12_PEEP_SPAWN_UNDEFINED)
if (_s6.PeepSpawns[i].x != kRCT12PeepSpawnUndefined)
{
PeepSpawn spawn = { _s6.PeepSpawns[i].x, _s6.PeepSpawns[i].y, _s6.PeepSpawns[i].z * 16,
_s6.PeepSpawns[i].direction };
@@ -2098,7 +2098,7 @@ namespace OpenRCT2::RCT2
auto srcThought = &src->Thoughts[i];
auto dstThought = &dst->Thoughts[i];
dstThought->type = static_cast<PeepThoughtType>(srcThought->Type);
if (srcThought->Item == RCT12PeepThoughtItemNone)
if (srcThought->Item == kRCT12PeepThoughtItemNone)
dstThought->item = kPeepThoughtItemNone;
else
dstThought->item = srcThought->Item;