Skip to content

Commit 7baae60

Browse files
GymnasiastGymnasiast
authored
Use ride_type_t in more places
1 parent 9658003 commit 7baae60

20 files changed

+34
-33
lines changed

‎src/openrct2-ui/windows/NewRide.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ namespace OpenRCT2::Ui::Windows
601601
return _lastTrackDesignCount;
602602
}
603603

604-
void UpdateVehicleAvailability(ObjectEntryIndex rideType)
604+
void UpdateVehicleAvailability(ride_type_t rideType)
605605
{
606606
_vehicleAvailability.clear();
607607
if (GetRideTypeDescriptor(rideType).HasFlag(RtdFlag::listVehiclesSeparately))

‎src/openrct2-ui/windows/Ride.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2007,7 +2007,7 @@ namespace OpenRCT2::Ui::Windows
20072007
const auto* rideEntry = ride.GetRideEntry();
20082008

20092009
bool selectionShouldBeExpanded;
2010-
int32_t rideTypeIterator, rideTypeIteratorMax;
2010+
ride_type_t rideTypeIterator, rideTypeIteratorMax;
20112011

20122012
const auto& gameState = GetGameState();
20132013
const auto& rtd = ride.GetRideTypeDescriptor();

‎src/openrct2-ui/windows/RideConstruction.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2736,7 +2736,7 @@ namespace OpenRCT2::Ui::Windows
27362736
}
27372737
};
27382738

2739-
static void WindowRideConstructionUpdateDisabledPieces(ObjectEntryIndex rideType)
2739+
static void WindowRideConstructionUpdateDisabledPieces(ride_type_t rideType)
27402740
{
27412741
RideTrackGroups disabledGroups{};
27422742
const auto& rtd = GetRideTypeDescriptor(rideType);

‎src/openrct2/actions/MazeSetTrackAction.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ GameActions::Result MazeSetTrackAction::Query() const
172172
}
173173

174174
auto ride = GetRide(_rideIndex);
175-
if (ride == nullptr || ride->type == RIDE_CRASH_TYPE_NONE)
175+
if (ride == nullptr || !RideTypeIsValid(ride->type))
176176
{
177177
LOG_ERROR("Ride not found for rideIndex %u", _rideIndex);
178178
res.Error = GameActions::Status::NoClearance;

‎src/openrct2/actions/RideCreateAction.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
using namespace OpenRCT2;
3232

3333
RideCreateAction::RideCreateAction(
34-
int32_t rideType, ObjectEntryIndex subType, int32_t colour1, int32_t colour2, ObjectEntryIndex entranceObjectIndex)
34+
ride_type_t rideType, ObjectEntryIndex subType, colour_t colour1, colour_t colour2, ObjectEntryIndex entranceObjectIndex)
3535
: _rideType(rideType)
3636
, _subType(subType)
3737
, _entranceObjectIndex(entranceObjectIndex)
@@ -49,12 +49,12 @@ void RideCreateAction::AcceptParameters(GameActionParameterVisitor& visitor)
4949
visitor.Visit("colour2", _colour2);
5050
}
5151

52-
int32_t RideCreateAction::GetRideType() const
52+
ride_type_t RideCreateAction::GetRideType() const
5353
{
5454
return _rideType;
5555
}
5656

57-
int32_t RideCreateAction::GetRideObject() const
57+
ObjectEntryIndex RideCreateAction::GetRideObject() const
5858
{
5959
return _subType;
6060
}

‎src/openrct2/actions/RideCreateAction.h

+7-6
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,22 @@
1414
class RideCreateAction final : public GameActionBase<GameCommand::CreateRide>
1515
{
1616
private:
17-
ObjectEntryIndex _rideType{ OBJECT_ENTRY_INDEX_NULL };
17+
ride_type_t _rideType{ RIDE_TYPE_NULL };
1818
ObjectEntryIndex _subType{ OBJECT_ENTRY_INDEX_NULL };
1919
ObjectEntryIndex _entranceObjectIndex{ OBJECT_ENTRY_INDEX_NULL };
20-
uint8_t _colour1{ 0xFF };
21-
uint8_t _colour2{ 0xFF };
20+
colour_t _colour1{ COLOUR_NULL };
21+
colour_t _colour2{ COLOUR_NULL };
2222

2323
public:
2424
RideCreateAction() = default;
2525
RideCreateAction(
26-
int32_t rideType, ObjectEntryIndex subType, int32_t colour1, int32_t colour2, ObjectEntryIndex entranceStyleIndex);
26+
ride_type_t rideType, ObjectEntryIndex subType, colour_t colour1, colour_t colour2,
27+
ObjectEntryIndex entranceStyleIndex);
2728

2829
void AcceptParameters(GameActionParameterVisitor& visitor) override;
2930

30-
int32_t GetRideType() const;
31-
int32_t GetRideObject() const;
31+
ride_type_t GetRideType() const;
32+
ObjectEntryIndex GetRideObject() const;
3233
uint16_t GetActionFlags() const override;
3334

3435
void Serialise(DataSerialiser& stream) override;

‎src/openrct2/actions/RideSetVehicleAction.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ GameActions::Result RideSetVehicleAction::Execute() const
225225
bool RideSetVehicleAction::RideIsVehicleTypeValid(const Ride& ride) const
226226
{
227227
bool selectionShouldBeExpanded;
228-
int32_t rideTypeIterator, rideTypeIteratorMax;
228+
ride_type_t rideTypeIterator, rideTypeIteratorMax;
229229
auto& gameState = GetGameState();
230230

231231
{

‎src/openrct2/entity/Guest.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2352,12 +2352,12 @@ bool Guest::HasRidden(const Ride& ride) const
23522352
return OpenRCT2::RideUse::GetHistory().Contains(Id, ride.id);
23532353
}
23542354

2355-
void Guest::SetHasRiddenRideType(int32_t rideType)
2355+
void Guest::SetHasRiddenRideType(ride_type_t rideType)
23562356
{
23572357
OpenRCT2::RideUse::GetTypeHistory().Add(Id, rideType);
23582358
}
23592359

2360-
bool Guest::HasRiddenRideType(int32_t rideType) const
2360+
bool Guest::HasRiddenRideType(ride_type_t rideType) const
23612361
{
23622362
return OpenRCT2::RideUse::GetTypeHistory().Contains(Id, rideType);
23632363
}

‎src/openrct2/entity/Guest.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,8 @@ struct Guest : Peep
346346
void SpendMoney(money64 amount, ExpenditureType type);
347347
void SetHasRidden(const Ride& ride);
348348
bool HasRidden(const Ride& ride) const;
349-
void SetHasRiddenRideType(int32_t rideType);
350-
bool HasRiddenRideType(int32_t rideType) const;
349+
void SetHasRiddenRideType(ride_type_t rideType);
350+
bool HasRiddenRideType(ride_type_t rideType) const;
351351
void SetParkEntryTime(int32_t entryTime);
352352
int32_t GetParkEntryTime() const;
353353
void CheckIfLost();

‎src/openrct2/management/Research.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ bool ResearchIsInvented(ObjectType objectType, ObjectEntryIndex index)
561561
}
562562
}
563563

564-
bool RideTypeIsInvented(uint32_t rideType)
564+
bool RideTypeIsInvented(ride_type_t rideType)
565565
{
566566
return RideTypeIsValid(rideType) ? _researchedRideTypes[rideType] : false;
567567
}
@@ -574,7 +574,7 @@ bool RideEntryIsInvented(ObjectEntryIndex rideEntryIndex)
574574
return _researchedRideEntries[rideEntryIndex];
575575
}
576576

577-
void RideTypeSetInvented(uint32_t rideType)
577+
void RideTypeSetInvented(ride_type_t rideType)
578578
{
579579
if (RideTypeIsValid(rideType))
580580
{

‎src/openrct2/management/Research.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@ void ResearchInsertRideEntry(ObjectEntryIndex entryIndex, bool researched);
132132
bool ResearchInsertSceneryGroupEntry(ObjectEntryIndex entryIndex, bool researched);
133133

134134
bool ResearchIsInvented(ObjectType objectType, ObjectEntryIndex index);
135-
void RideTypeSetInvented(uint32_t rideType);
135+
void RideTypeSetInvented(ride_type_t rideType);
136136
void RideEntrySetInvented(ObjectEntryIndex rideEntryIndex);
137137
void ScenerySetInvented(const ScenerySelection& sceneryItem);
138138
void ScenerySetNotInvented(const ScenerySelection& sceneryItem);
139-
bool RideTypeIsInvented(uint32_t rideType);
139+
bool RideTypeIsInvented(ride_type_t rideType);
140140
bool RideEntryIsInvented(ObjectEntryIndex rideEntryIndex);
141141
bool SceneryGroupIsInvented(int32_t sgIndex);
142142
void SceneryGroupSetInvented(int32_t sgIndex);

‎src/openrct2/network/NetworkBase.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ using namespace OpenRCT2;
5050
// It is used for making sure only compatible builds get connected, even within
5151
// single OpenRCT2 version.
5252

53-
constexpr uint8_t kNetworkStreamVersion = 1;
53+
constexpr uint8_t kNetworkStreamVersion = 2;
5454

5555
const std::string kNetworkStreamID = std::string(OPENRCT2_VERSION) + "-" + std::to_string(kNetworkStreamVersion);
5656

‎src/openrct2/object/RideObject.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ void RideObject::ReadJson(IReadObjectContext* context, json_t& root)
528528

529529
for (size_t i = 0; i < RCT2::ObjectLimits::MaxRideTypesPerRideEntry; i++)
530530
{
531-
ObjectEntryIndex rideType = RIDE_TYPE_NULL;
531+
auto rideType = RIDE_TYPE_NULL;
532532

533533
if (i < numRideTypes)
534534
{

‎src/openrct2/rct2/S6Importer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ namespace OpenRCT2::RCT2
701701
*dst = {};
702702
dst->id = rideIndex;
703703

704-
ObjectEntryIndex rideType = src->Type;
704+
auto rideType = src->Type;
705705
auto subtype = RCTEntryIndexToOpenRCT2EntryIndex(src->Subtype);
706706
if (RCT2RideTypeNeedsConversion(src->Type))
707707
{

‎src/openrct2/ride/Ride.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5479,9 +5479,9 @@ bool RideEntryHasCategory(const RideObjectEntry& rideEntry, uint8_t category)
54795479
return GetRideTypeDescriptor(rideType).Category == category;
54805480
}
54815481

5482-
int32_t RideGetEntryIndex(int32_t rideType, int32_t rideSubType)
5482+
ObjectEntryIndex RideGetEntryIndex(ride_type_t rideType, ObjectEntryIndex rideSubType)
54835483
{
5484-
int32_t subType = rideSubType;
5484+
auto subType = rideSubType;
54855485

54865486
if (subType == OBJECT_ENTRY_INDEX_NULL)
54875487
{

‎src/openrct2/ride/Ride.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ int32_t GetBoosterSpeed(ride_type_t rideType, int32_t rawSpeed);
996996
void FixInvalidVehicleSpriteSizes();
997997
bool RideEntryHasCategory(const RideObjectEntry& rideEntry, uint8_t category);
998998

999-
int32_t RideGetEntryIndex(int32_t rideType, int32_t rideSubType);
999+
ObjectEntryIndex RideGetEntryIndex(ride_type_t rideType, ObjectEntryIndex rideSubType);
10001000

10011001
void DetermineRideEntranceAndExitLocations();
10021002
void RideClearLeftoverEntrances(const Ride& ride);

‎src/openrct2/ride/RideData.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -649,15 +649,15 @@ constexpr RideTypeDescriptor DummyRTD =
649649
};
650650
// clang-format on
651651

652-
constexpr const RideTypeDescriptor& GetRideTypeDescriptor(ObjectEntryIndex rideType)
652+
constexpr const RideTypeDescriptor& GetRideTypeDescriptor(ride_type_t rideType)
653653
{
654654
if (rideType >= std::size(RideTypeDescriptors))
655655
return DummyRTD;
656656

657657
return RideTypeDescriptors[rideType];
658658
}
659659

660-
constexpr bool RideTypeIsValid(ObjectEntryIndex rideType)
660+
constexpr bool RideTypeIsValid(ride_type_t rideType)
661661
{
662662
return rideType < std::size(RideTypeDescriptors);
663663
}

‎src/openrct2/ride/Track.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ TrackRoll TrackGetActualBank(TileElement* tileElement, TrackRoll bank)
534534
return bank;
535535
}
536536

537-
TrackRoll TrackGetActualBank2(int32_t rideType, bool isInverted, TrackRoll bank)
537+
TrackRoll TrackGetActualBank2(ride_type_t rideType, bool isInverted, TrackRoll bank)
538538
{
539539
if (GetRideTypeDescriptor(rideType).HasFlag(RtdFlag::hasInvertedVariant))
540540
{

‎src/openrct2/ride/Track.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ std::optional<CoordsXYZ> GetTrackElementOriginAndApplyChanges(
714714
uint16_t flags);
715715

716716
TrackRoll TrackGetActualBank(TileElement* tileElement, TrackRoll bank);
717-
TrackRoll TrackGetActualBank2(int32_t rideType, bool isInverted, TrackRoll bank);
717+
TrackRoll TrackGetActualBank2(ride_type_t rideType, bool isInverted, TrackRoll bank);
718718
TrackRoll TrackGetActualBank3(bool useInvertedSprites, TileElement* tileElement);
719719

720720
ResultWithMessage TrackAddStationElement(CoordsXYZD loc, RideId rideIndex, int32_t flags, bool fromTrackDesign);

‎src/openrct2/ride/Vehicle.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6996,7 +6996,7 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(
69966996
// Update VehicleFlags::CarIsInverted flag
69976997
ClearFlag(VehicleFlags::CarIsInverted);
69986998
{
6999-
int32_t rideType = ::GetRide(tileElement->AsTrack()->GetRideIndex())->type;
6999+
auto rideType = ::GetRide(tileElement->AsTrack()->GetRideIndex())->type;
70007000
if (GetRideTypeDescriptor(rideType).HasFlag(RtdFlag::hasInvertedVariant))
70017001
{
70027002
if (tileElement->AsTrack()->IsInverted())

0 commit comments

Comments
 (0)