mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 05:32:54 +01:00
Code Issues Releases Wiki Activity

Create strong enum for RideTestingFlags

Browse Source
This commit is contained in:
Gymnasiast
2025-03-07 22:36:04 +01:00
parent 3800d0bca1
commit 73cda29208
5 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1571,7 +1571,7 @@ namespace OpenRCT2
cs.ReadWrite(ride.previousVerticalG);
cs.ReadWrite(ride.previousLateralG);
cs.ReadWrite(ride.testingFlags);
cs.ReadWrite(ride.testingFlags.holder);
cs.ReadWrite(ride.curTestTrackLocation);
cs.ReadWrite(ride.turnCountDefault);

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

@@ -1081,7 +1081,7 @@ namespace OpenRCT2::RCT1
dst->curTestTrackLocation = { src->curTestTrackLocation.x, src->curTestTrackLocation.y,
src->curTestTrackZ / 2 };
}
dst->testingFlags = src->testingFlags;
dst->testingFlags.holder = src->testingFlags;
dst->currentTestSegment = src->currentTestSegment;
dst->currentTestStation = StationIndex::GetNull();
dst->averageSpeedTestTimeout = src->averageSpeedTestTimeout;

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

@@ -852,7 +852,7 @@ namespace OpenRCT2::RCT2
dst->previousVerticalG = src->previousVerticalG;
dst->previousLateralG = src->previousLateralG;
// Pad106[0x2];
dst->testingFlags = src->testingFlags;
dst->testingFlags.holder = src->testingFlags;
if (src->curTestTrackLocation.IsNull())
{

28
src/openrct2/ride/Ride.h
View File

@@ -13,6 +13,7 @@
#include "../actions/ResultWithMessage.h"
#include "../core/BitSet.hpp"
#include "../core/FixedPoint.hpp"
#include "../core/FlagHolder.hpp"
#include "../localisation/Formatter.h"
#include "../object/MusicObject.h"
#include "../rct2/DATLimits.h"
@@ -62,6 +63,19 @@ constexpr money64 kRideMaxPrice = 20.00_GBP;
extern const StringId kRideInspectionIntervalNames[];
enum class RideTestingFlag : uint8_t
{
sheltered,
turnLeft,
turnRight,
turnBanked,
turnSloped,
dropDown,
poweredLift,
dropUp,
};
using RideTestingFlags = FlagHolder<uint32_t, RideTestingFlag>;
struct RideStation
{
static constexpr uint8_t kNoTrain = std::numeric_limits<uint8_t>::max();
@@ -179,7 +193,7 @@ struct Ride
fixed16_2dp maxLateralG{};
fixed16_2dp previousVerticalG{};
fixed16_2dp previousLateralG{};
uint32_t testingFlags{};
RideTestingFlags testingFlags{};
// x y z map location of the current track piece during a test
// this is to prevent counting special tracks multiple times
TileCoordsXYZ curTestTrackLocation;
@@ -505,18 +519,6 @@ enum
RIDE_ENTRY_FLAG_HIDE_EMPTY_TRAINS = 1 << 22,
};
enum
{
RIDE_TESTING_SHELTERED = (1 << 0),
RIDE_TESTING_TURN_LEFT = (1 << 1),
RIDE_TESTING_TURN_RIGHT = (1 << 2),
RIDE_TESTING_TURN_BANKED = (1 << 3),
RIDE_TESTING_TURN_SLOPED = (1 << 4),
RIDE_TESTING_DROP_DOWN = (1 << 5),
RIDE_TESTING_POWERED_LIFT = (1 << 6),
RIDE_TESTING_DROP_UP = (1 << 7),
};
enum
{
RIDE_TYPE_SPIRAL_ROLLER_COASTER = 0,

63
src/openrct2/ride/Vehicle.cpp
View File

@@ -910,9 +910,9 @@ void Vehicle::UpdateMeasurements()
auto trackElemType = GetTrackType();
if (trackElemType == TrackElemType::PoweredLift || HasFlag(VehicleFlags::OnLiftHill))
{
if (!(curRide->testingFlags & RIDE_TESTING_POWERED_LIFT))
if (!(curRide->testingFlags.has(RideTestingFlag::poweredLift)))
{
curRide->testingFlags |= RIDE_TESTING_POWERED_LIFT;
curRide->testingFlags.set(RideTestingFlag::poweredLift);
auto numPoweredLifts = curRide->getNumPoweredLifts();
if (numPoweredLifts < kRideMaxNumPoweredLiftsCount)
{
@@ -923,7 +923,7 @@ void Vehicle::UpdateMeasurements()
}
else
{
curRide->testingFlags &= ~RIDE_TESTING_POWERED_LIFT;
curRide->testingFlags.unset(RideTestingFlag::poweredLift);
}
const auto& rtd = curRide->getRideTypeDescriptor();
@@ -953,27 +953,28 @@ void Vehicle::UpdateMeasurements()
const auto& ted = GetTrackElementDescriptor(trackElemType);
uint16_t trackFlags = ted.flags;
uint32_t testingFlags = curRide->testingFlags;
if (testingFlags & RIDE_TESTING_TURN_LEFT && trackFlags & TRACK_ELEM_FLAG_TURN_LEFT)
auto testingFlags = curRide->testingFlags;
if (testingFlags.has(RideTestingFlag::turnLeft) && trackFlags & TRACK_ELEM_FLAG_TURN_LEFT)
{
// 0x800 as this is masked to kCurrentTurnCountMask
curRide->turnCountDefault += 0x800;
}
else if (testingFlags & RIDE_TESTING_TURN_RIGHT && trackFlags & TRACK_ELEM_FLAG_TURN_RIGHT)
else if (testingFlags.has(RideTestingFlag::turnRight) && trackFlags & TRACK_ELEM_FLAG_TURN_RIGHT)
{
// 0x800 as this is masked to kCurrentTurnCountMask
curRide->turnCountDefault += 0x800;
}
else if (testingFlags & RIDE_TESTING_TURN_RIGHT || testingFlags & RIDE_TESTING_TURN_LEFT)
else if (testingFlags.has(RideTestingFlag::turnRight) || testingFlags.has(RideTestingFlag::turnLeft))
{
curRide->testingFlags &= ~(
RIDE_TESTING_TURN_LEFT | RIDE_TESTING_TURN_RIGHT | RIDE_TESTING_TURN_BANKED | RIDE_TESTING_TURN_SLOPED);
curRide->testingFlags.unset(
RideTestingFlag::turnLeft, RideTestingFlag::turnRight, RideTestingFlag::turnBanked,
RideTestingFlag::turnSloped);
uint8_t turnType = 1;
if (!(testingFlags & RIDE_TESTING_TURN_BANKED))
if (!(testingFlags.has(RideTestingFlag::turnBanked)))
{
turnType = 2;
if (!(testingFlags & RIDE_TESTING_TURN_SLOPED))
if (!(testingFlags.has(RideTestingFlag::turnSloped)))
{
turnType = 0;
}
@@ -998,40 +999,40 @@ void Vehicle::UpdateMeasurements()
{
if (trackFlags & TRACK_ELEM_FLAG_TURN_LEFT)
{
curRide->testingFlags |= RIDE_TESTING_TURN_LEFT;
curRide->testingFlags.set(RideTestingFlag::turnLeft);
curRide->turnCountDefault &= ~kCurrentTurnCountMask;
if (trackFlags & TRACK_ELEM_FLAG_TURN_BANKED)
{
curRide->testingFlags |= RIDE_TESTING_TURN_BANKED;
curRide->testingFlags.set(RideTestingFlag::turnBanked);
}
if (trackFlags & TRACK_ELEM_FLAG_TURN_SLOPED)
{
curRide->testingFlags |= RIDE_TESTING_TURN_SLOPED;
curRide->testingFlags.set(RideTestingFlag::turnSloped);
}
}
if (trackFlags & TRACK_ELEM_FLAG_TURN_RIGHT)
{
curRide->testingFlags |= RIDE_TESTING_TURN_RIGHT;
curRide->testingFlags.set(RideTestingFlag::turnRight);
curRide->turnCountDefault &= ~kCurrentTurnCountMask;
if (trackFlags & TRACK_ELEM_FLAG_TURN_BANKED)
{
curRide->testingFlags |= RIDE_TESTING_TURN_BANKED;
curRide->testingFlags.set(RideTestingFlag::turnBanked);
}
if (trackFlags & TRACK_ELEM_FLAG_TURN_SLOPED)
{
curRide->testingFlags |= RIDE_TESTING_TURN_SLOPED;
curRide->testingFlags.set(RideTestingFlag::turnSloped);
}
}
}
if (testingFlags & RIDE_TESTING_DROP_DOWN)
if (testingFlags.has(RideTestingFlag::dropDown))
{
if (velocity < 0 || !(trackFlags & TRACK_ELEM_FLAG_DOWN))
{
curRide->testingFlags &= ~RIDE_TESTING_DROP_DOWN;
curRide->testingFlags.unset(RideTestingFlag::dropDown);
int16_t curZ = z / kCoordsZStep - curRide->startDropHeight;
if (curZ < 0)
@@ -1046,8 +1047,8 @@ void Vehicle::UpdateMeasurements()
}
else if (trackFlags & TRACK_ELEM_FLAG_DOWN && velocity >= 0)
{
curRide->testingFlags &= ~RIDE_TESTING_DROP_UP;
curRide->testingFlags |= RIDE_TESTING_DROP_DOWN;
curRide->testingFlags.unset(RideTestingFlag::dropUp);
curRide->testingFlags.set(RideTestingFlag::dropDown);
uint8_t drops = curRide->getNumDrops();
if (drops < kRideMaxDropsCount)
@@ -1055,14 +1056,14 @@ void Vehicle::UpdateMeasurements()
curRide->setNumDrops(drops);
curRide->startDropHeight = z / kCoordsZStep;
testingFlags &= ~RIDE_TESTING_DROP_UP;
testingFlags.unset(RideTestingFlag::dropUp);
}
if (testingFlags & RIDE_TESTING_DROP_UP)
if (testingFlags.has(RideTestingFlag::dropUp))
{
if (velocity > 0 || !(trackFlags & TRACK_ELEM_FLAG_UP))
{
curRide->testingFlags &= ~RIDE_TESTING_DROP_UP;
curRide->testingFlags.unset(RideTestingFlag::dropUp);
int16_t curZ = z / kCoordsZStep - curRide->startDropHeight;
if (curZ < 0)
@@ -1077,8 +1078,8 @@ void Vehicle::UpdateMeasurements()
}
else if (trackFlags & TRACK_ELEM_FLAG_UP && velocity <= 0)
{
curRide->testingFlags &= ~RIDE_TESTING_DROP_DOWN;
curRide->testingFlags |= RIDE_TESTING_DROP_UP;
curRide->testingFlags.unset(RideTestingFlag::dropDown);
curRide->testingFlags.set(RideTestingFlag::dropUp);
auto drops = curRide->getNumDrops();
if (drops != kRideMaxDropsCount)
@@ -1104,7 +1105,7 @@ void Vehicle::UpdateMeasurements()
if (x == kLocationNull)
{
curRide->testingFlags &= ~RIDE_TESTING_SHELTERED;
curRide->testingFlags.unset(RideTestingFlag::sheltered);
return;
}
@@ -1154,14 +1155,14 @@ void Vehicle::UpdateMeasurements()
if (!coverFound)
{
curRide->testingFlags &= ~RIDE_TESTING_SHELTERED;
curRide->testingFlags.unset(RideTestingFlag::sheltered);
return;
}
}
if (!(curRide->testingFlags & RIDE_TESTING_SHELTERED))
if (!(curRide->testingFlags.has(RideTestingFlag::sheltered)))
{
curRide->testingFlags |= RIDE_TESTING_SHELTERED;
curRide->testingFlags.set(RideTestingFlag::sheltered);
curRide->increaseNumShelteredSections();
@@ -2366,7 +2367,7 @@ static void test_reset(Ride& ride, StationIndex curStation)
ride.maxLateralG = 0;
ride.previousVerticalG = 0;
ride.previousLateralG = 0;
ride.testingFlags = 0;
ride.testingFlags.clearAll();
ride.curTestTrackLocation.SetNull();
ride.turnCountDefault = 0;
ride.turnCountBanked = 0;