From 3b632fcf9519952d1b19c4351ac755efad7b585c Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Wed, 13 May 2020 23:06:40 -0300 Subject: [PATCH] Rename Peep::favourite_ride to FavouriteRide --- src/openrct2-ui/windows/Guest.cpp | 4 ++-- src/openrct2/GameStateSnapshots.cpp | 2 +- src/openrct2/actions/RideDemolishAction.hpp | 4 ++-- src/openrct2/actions/StaffHireNewAction.hpp | 2 +- src/openrct2/peep/Guest.cpp | 2 +- src/openrct2/peep/Peep.cpp | 2 +- src/openrct2/peep/Peep.h | 2 +- src/openrct2/rct1/S4Importer.cpp | 4 ++-- src/openrct2/rct2/S6Exporter.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- src/openrct2/ride/Ride.cpp | 4 ++-- test/tests/S6ImportExportTests.cpp | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index f2e48afedd..af5f299deb 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -1698,9 +1698,9 @@ void window_guest_rides_paint(rct_window* w, rct_drawpixelinfo* dpi) y = w->windowPos.y + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].bottom - 12; set_format_arg(0, rct_string_id, STR_PEEP_FAVOURITE_RIDE_NOT_AVAILABLE); - if (peep->favourite_ride != RIDE_ID_NULL) + if (peep->FavouriteRide != RIDE_ID_NULL) { - auto ride = get_ride(peep->favourite_ride); + auto ride = get_ride(peep->FavouriteRide); if (ride != nullptr) { ride->FormatNameTo(gCommonFormatArgs); diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index f66435f787..b59645f0cd 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -311,7 +311,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots COMPARE_FIELD(Peep, balloon_colour); COMPARE_FIELD(Peep, umbrella_colour); COMPARE_FIELD(Peep, hat_colour); - COMPARE_FIELD(Peep, favourite_ride); + COMPARE_FIELD(Peep, FavouriteRide); COMPARE_FIELD(Peep, FavouriteRideRating); COMPARE_FIELD(Peep, ItemStandardFlags); } diff --git a/src/openrct2/actions/RideDemolishAction.hpp b/src/openrct2/actions/RideDemolishAction.hpp index 1f85a68b4b..a001fb611b 100644 --- a/src/openrct2/actions/RideDemolishAction.hpp +++ b/src/openrct2/actions/RideDemolishAction.hpp @@ -218,9 +218,9 @@ private: { peep->guest_heading_to_ride_id = RIDE_ID_NULL; } - if (peep->favourite_ride == _rideIndex) + if (peep->FavouriteRide == _rideIndex) { - peep->favourite_ride = RIDE_ID_NULL; + peep->FavouriteRide = RIDE_ID_NULL; } for (int32_t i = 0; i < PEEP_MAX_THOUGHTS; i++) diff --git a/src/openrct2/actions/StaffHireNewAction.hpp b/src/openrct2/actions/StaffHireNewAction.hpp index 0b4185de55..9edc1b10f4 100644 --- a/src/openrct2/actions/StaffHireNewAction.hpp +++ b/src/openrct2/actions/StaffHireNewAction.hpp @@ -173,7 +173,7 @@ private: newPeep->paid_on_rides = 0; newPeep->paid_on_food = 0; newPeep->paid_on_souvenirs = 0; - newPeep->favourite_ride = RIDE_ID_NULL; + newPeep->FavouriteRide = RIDE_ID_NULL; newPeep->staff_orders = _staffOrders; uint16_t idSearchSpriteIndex; diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index 72d79776bf..71d660812d 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -1787,7 +1787,7 @@ void Guest::OnExitRide(ride_id_t rideIndex) if (peep_flags & PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE) { peep_flags &= ~PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE; - favourite_ride = rideIndex; + FavouriteRide = rideIndex; // TODO fix this flag name or add another one window_invalidate_flags |= PEEP_INVALIDATE_STAFF_STATS; } diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 4b89aa3970..b0d43b040b 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -1634,7 +1634,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords) peep->no_action_frame_num = 0; peep->action_sprite_type = PEEP_ACTION_SPRITE_TYPE_NONE; peep->peep_flags = 0; - peep->favourite_ride = RIDE_ID_NULL; + peep->FavouriteRide = RIDE_ID_NULL; peep->FavouriteRideRating = 0; const rct_sprite_bounds* spriteBounds = g_peep_animation_entries[peep->sprite_type].sprite_bounds; diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 5791542dc7..0ac11bcab7 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -745,7 +745,7 @@ struct Peep : SpriteBase uint8_t balloon_colour; uint8_t umbrella_colour; uint8_t hat_colour; - uint8_t favourite_ride; + uint8_t FavouriteRide; uint8_t FavouriteRideRating; uint32_t ItemStandardFlags; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index a08d75ec8c..a2e3a9f258 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1542,12 +1542,12 @@ private: // Set it to N/A if the save comes from the original or AA. if (_gameVersion == FILE_VERSION_RCT1_LL) { - dst->favourite_ride = src->favourite_ride; + dst->FavouriteRide = src->favourite_ride; dst->FavouriteRideRating = src->favourite_ride_rating; } else { - dst->favourite_ride = RIDE_ID_NULL; + dst->FavouriteRide = RIDE_ID_NULL; dst->FavouriteRideRating = 0; } diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index bddb50df95..27f1cd8a6e 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1238,7 +1238,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src) dst->balloon_colour = src->balloon_colour; dst->umbrella_colour = src->umbrella_colour; dst->hat_colour = src->hat_colour; - dst->favourite_ride = src->favourite_ride; + dst->favourite_ride = src->FavouriteRide; dst->favourite_ride_rating = src->FavouriteRideRating; dst->item_standard_flags = src->ItemStandardFlags; } diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index f273392085..30a2c430ce 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1503,7 +1503,7 @@ public: dst->balloon_colour = src->balloon_colour; dst->umbrella_colour = src->umbrella_colour; dst->hat_colour = src->hat_colour; - dst->favourite_ride = src->favourite_ride; + dst->FavouriteRide = src->favourite_ride; dst->FavouriteRideRating = src->favourite_ride_rating; dst->ItemStandardFlags = src->item_standard_flags; } diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index b15d9bae91..03a2b48536 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -324,9 +324,9 @@ void ride_update_favourited_stat() FOR_ALL_GUESTS (spriteIndex, peep) { - if (peep->favourite_ride != RIDE_ID_NULL) + if (peep->FavouriteRide != RIDE_ID_NULL) { - auto ride = get_ride(peep->favourite_ride); + auto ride = get_ride(peep->FavouriteRide); if (ride != nullptr) { ride->guests_favourite++; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index a4bbf03ce7..ceec56d252 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -264,7 +264,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right) COMPARE_FIELD(balloon_colour); COMPARE_FIELD(umbrella_colour); COMPARE_FIELD(hat_colour); - COMPARE_FIELD(favourite_ride); + COMPARE_FIELD(FavouriteRide); COMPARE_FIELD(FavouriteRideRating); COMPARE_FIELD(ItemStandardFlags); }