diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index bf268292ee..9dee518e69 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -2015,7 +2015,7 @@ static rct_string_id window_guest_inventory_format_item(Peep* peep, int32_t item ft.Add(SPRITE_ID_PALETTE_COLOUR_1(peep->tshirt_colour) | ShopItems[item].Image); break; case SHOP_ITEM_PHOTO2: - ride = get_ride(peep->photo2_ride_ref); + ride = get_ride(peep->Photo2RideRef); if (ride != nullptr) ride->FormatNameTo(gCommonFormatArgs + 6); break; diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index a90d921b99..5806cb458a 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -247,7 +247,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots COMPARE_FIELD(Peep, ride_types_been_on[i]); } COMPARE_FIELD(Peep, item_extra_flags); - COMPARE_FIELD(Peep, photo2_ride_ref); + COMPARE_FIELD(Peep, Photo2RideRef); COMPARE_FIELD(Peep, Photo3RideRef); COMPARE_FIELD(Peep, Photo4RideRef); COMPARE_FIELD(Peep, CurrentRide); diff --git a/src/openrct2/actions/RideDemolishAction.hpp b/src/openrct2/actions/RideDemolishAction.hpp index 346fe7f70c..b878b00906 100644 --- a/src/openrct2/actions/RideDemolishAction.hpp +++ b/src/openrct2/actions/RideDemolishAction.hpp @@ -194,7 +194,7 @@ private: } if (peep->item_extra_flags & PEEP_ITEM_PHOTO2) { - if (peep->photo2_ride_ref == _rideIndex) + if (peep->Photo2RideRef == _rideIndex) { peep->item_extra_flags &= ~PEEP_ITEM_PHOTO2; } diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index 97864a7954..152c4f7009 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -1673,7 +1673,7 @@ loc_69B221: Photo1RideRef = ride->id; if (shopItem == SHOP_ITEM_PHOTO2) - photo2_ride_ref = ride->id; + Photo2RideRef = ride->id; if (shopItem == SHOP_ITEM_PHOTO3) Photo3RideRef = ride->id; diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index f2711a70ce..db1c1deb1c 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -632,7 +632,7 @@ struct Peep : SpriteBase money16 paid_on_drink; uint8_t ride_types_been_on[16]; uint32_t item_extra_flags; - uint8_t photo2_ride_ref; + uint8_t Photo2RideRef; uint8_t Photo3RideRef; uint8_t Photo4RideRef; uint8_t CurrentRide; diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 66f31feaab..ae46aa80d5 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1169,7 +1169,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src) dst->ride_types_been_on[i] = src->ride_types_been_on[i]; } dst->item_extra_flags = src->item_extra_flags; - dst->photo2_ride_ref = src->photo2_ride_ref; + dst->photo2_ride_ref = src->Photo2RideRef; dst->photo3_ride_ref = src->Photo3RideRef; dst->photo4_ride_ref = src->Photo4RideRef; dst->current_ride = src->CurrentRide; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index df66f2fd45..ca30d433da 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1434,7 +1434,7 @@ public: dst->ride_types_been_on[i] = src->ride_types_been_on[i]; } dst->item_extra_flags = src->item_extra_flags; - dst->photo2_ride_ref = src->photo2_ride_ref; + dst->Photo2RideRef = src->photo2_ride_ref; dst->Photo3RideRef = src->photo3_ride_ref; dst->Photo4RideRef = src->photo4_ride_ref; dst->CurrentRide = src->current_ride; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index bf006a2162..629961a8af 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -191,7 +191,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right) COMPARE_FIELD(ride_types_been_on[i]); } COMPARE_FIELD(item_extra_flags); - COMPARE_FIELD(photo2_ride_ref); + COMPARE_FIELD(Photo2RideRef); COMPARE_FIELD(Photo3RideRef); COMPARE_FIELD(Photo4RideRef); COMPARE_FIELD(CurrentRide);