diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 19863e955e..bf268292ee 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -2020,7 +2020,7 @@ static rct_string_id window_guest_inventory_format_item(Peep* peep, int32_t item ride->FormatNameTo(gCommonFormatArgs + 6); break; case SHOP_ITEM_PHOTO3: - ride = get_ride(peep->photo3_ride_ref); + ride = get_ride(peep->Photo3RideRef); if (ride != nullptr) ride->FormatNameTo(gCommonFormatArgs + 6); break; diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 154ee45dc8..a90d921b99 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -248,7 +248,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots } COMPARE_FIELD(Peep, item_extra_flags); COMPARE_FIELD(Peep, photo2_ride_ref); - COMPARE_FIELD(Peep, photo3_ride_ref); + COMPARE_FIELD(Peep, Photo3RideRef); COMPARE_FIELD(Peep, Photo4RideRef); COMPARE_FIELD(Peep, CurrentRide); COMPARE_FIELD(Peep, CurrentRideStation); diff --git a/src/openrct2/actions/RideDemolishAction.hpp b/src/openrct2/actions/RideDemolishAction.hpp index d144651816..346fe7f70c 100644 --- a/src/openrct2/actions/RideDemolishAction.hpp +++ b/src/openrct2/actions/RideDemolishAction.hpp @@ -201,7 +201,7 @@ private: } if (peep->item_extra_flags & PEEP_ITEM_PHOTO3) { - if (peep->photo3_ride_ref == _rideIndex) + if (peep->Photo3RideRef == _rideIndex) { peep->item_extra_flags &= ~PEEP_ITEM_PHOTO3; } diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index 9a36549218..97864a7954 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -1676,7 +1676,7 @@ loc_69B221: photo2_ride_ref = ride->id; if (shopItem == SHOP_ITEM_PHOTO3) - photo3_ride_ref = ride->id; + Photo3RideRef = ride->id; if (shopItem == SHOP_ITEM_PHOTO4) Photo4RideRef = ride->id; diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index ffc985e5e8..f2711a70ce 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -633,7 +633,7 @@ struct Peep : SpriteBase uint8_t ride_types_been_on[16]; uint32_t item_extra_flags; uint8_t photo2_ride_ref; - uint8_t photo3_ride_ref; + uint8_t Photo3RideRef; uint8_t Photo4RideRef; uint8_t CurrentRide; StationIndex CurrentRideStation; diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 8012e94c40..66f31feaab 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1170,7 +1170,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src) } dst->item_extra_flags = src->item_extra_flags; dst->photo2_ride_ref = src->photo2_ride_ref; - dst->photo3_ride_ref = src->photo3_ride_ref; + dst->photo3_ride_ref = src->Photo3RideRef; dst->photo4_ride_ref = src->Photo4RideRef; dst->current_ride = src->CurrentRide; dst->current_ride_station = src->CurrentRideStation; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index d68656183e..df66f2fd45 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1435,7 +1435,7 @@ public: } dst->item_extra_flags = src->item_extra_flags; dst->photo2_ride_ref = src->photo2_ride_ref; - dst->photo3_ride_ref = src->photo3_ride_ref; + dst->Photo3RideRef = src->photo3_ride_ref; dst->Photo4RideRef = src->photo4_ride_ref; dst->CurrentRide = src->current_ride; dst->CurrentRideStation = src->current_ride_station; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index bf49222b07..bf006a2162 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -192,7 +192,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right) } COMPARE_FIELD(item_extra_flags); COMPARE_FIELD(photo2_ride_ref); - COMPARE_FIELD(photo3_ride_ref); + COMPARE_FIELD(Photo3RideRef); COMPARE_FIELD(Photo4RideRef); COMPARE_FIELD(CurrentRide); COMPARE_FIELD(CurrentRideStation);