diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 98d08a9f54..27b959c074 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -244,7 +244,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots COMPARE_FIELD(Peep, paid_on_drink); for (int i = 0; i < 16; i++) { - COMPARE_FIELD(Peep, ride_types_been_on[i]); + COMPARE_FIELD(Peep, RideTypesBeenOn[i]); } COMPARE_FIELD(Peep, ItemExtraFlags); COMPARE_FIELD(Peep, Photo2RideRef); diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index f19b7a270e..ef534bd9d4 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -2377,12 +2377,12 @@ bool Guest::HasRidden(const Ride* ride) const void Guest::SetHasRiddenRideType(int32_t rideType) { - ride_types_been_on[rideType / 8] |= 1 << (rideType % 8); + RideTypesBeenOn[rideType / 8] |= 1 << (rideType % 8); } bool Guest::HasRiddenRideType(int32_t rideType) const { - return ride_types_been_on[rideType / 8] & (1 << (rideType % 8)); + return RideTypesBeenOn[rideType / 8] & (1 << (rideType % 8)); } void Guest::ChoseNotToGoOnRide(Ride* ride, bool peepAtRide, bool updateLastRide) diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 3e6fe834cb..5695b5c034 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -1718,7 +1718,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords) std::fill_n(peep->RidesBeenOn, 32, 0x00); peep->no_of_rides = 0; - std::fill_n(peep->ride_types_been_on, 16, 0x00); + std::fill_n(peep->RideTypesBeenOn, 16, 0x00); peep->Id = gNextGuestNumber++; peep->name = nullptr; diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 3d5c760889..e8316c5a92 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -630,7 +630,7 @@ struct Peep : SpriteBase uint8_t nausea_tolerance; uint8_t window_invalidate_flags; money16 paid_on_drink; - uint8_t ride_types_been_on[16]; + uint8_t RideTypesBeenOn[16]; uint32_t ItemExtraFlags; uint8_t Photo2RideRef; uint8_t Photo3RideRef; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 373a14562a..4a65a43bf4 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1507,7 +1507,7 @@ private: } for (size_t i = 0; i < 16; i++) { - dst->ride_types_been_on[i] = src->ride_types_been_on[i]; + dst->RideTypesBeenOn[i] = src->ride_types_been_on[i]; } dst->Photo1RideRef = src->photo1_ride_ref; diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 6ef8af5716..fd5a4e820d 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1164,9 +1164,9 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src) dst->nausea_tolerance = src->nausea_tolerance; dst->window_invalidate_flags = src->window_invalidate_flags; dst->paid_on_drink = src->paid_on_drink; - for (size_t i = 0; i < std::size(src->ride_types_been_on); i++) + for (size_t i = 0; i < std::size(src->RideTypesBeenOn); i++) { - dst->ride_types_been_on[i] = src->ride_types_been_on[i]; + dst->ride_types_been_on[i] = src->RideTypesBeenOn[i]; } dst->item_extra_flags = src->ItemExtraFlags; dst->photo2_ride_ref = src->Photo2RideRef; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index a37194c7e0..a0ff12d36a 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1431,7 +1431,7 @@ public: dst->paid_on_drink = src->paid_on_drink; for (size_t i = 0; i < std::size(src->ride_types_been_on); i++) { - dst->ride_types_been_on[i] = src->ride_types_been_on[i]; + dst->RideTypesBeenOn[i] = src->ride_types_been_on[i]; } dst->ItemExtraFlags = src->item_extra_flags; dst->Photo2RideRef = src->photo2_ride_ref; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 0de6b998b4..8775ccc2be 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -188,7 +188,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right) COMPARE_FIELD(paid_on_drink); for (int i = 0; i < PEEP_MAX_THOUGHTS; i++) { - COMPARE_FIELD(ride_types_been_on[i]); + COMPARE_FIELD(RideTypesBeenOn[i]); } COMPARE_FIELD(ItemExtraFlags); COMPARE_FIELD(Photo2RideRef);