From 3f091d33e2907d50fa0c8c07db616937dd42c9f0 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Sat, 30 May 2020 19:41:57 -0300 Subject: [PATCH] Rename Peep::paid_on_rides to PaidOnRides --- src/openrct2-ui/windows/Guest.cpp | 2 +- src/openrct2/GameStateSnapshots.cpp | 2 +- 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 | 2 +- src/openrct2/rct2/S6Exporter.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- test/tests/S6ImportExportTests.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 4de771e4ca..7dc53850b7 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -1795,7 +1795,7 @@ void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi) // Paid on rides y += LIST_ROW_HEIGHT; - set_format_arg(0, money32, peep->paid_on_rides); + set_format_arg(0, money32, peep->PaidOnRides); set_format_arg(4, uint16_t, peep->no_of_rides); if (peep->no_of_rides != 1) { diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 0f54bff929..bc22d699a6 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -295,7 +295,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots COMPARE_FIELD(Peep, time_on_ride); COMPARE_FIELD(Peep, disgusting_count); COMPARE_FIELD(Peep, paid_to_enter); - COMPARE_FIELD(Peep, paid_on_rides); + COMPARE_FIELD(Peep, PaidOnRides); COMPARE_FIELD(Peep, PaidOnFood); COMPARE_FIELD(Peep, PaidOnSouvenirs); COMPARE_FIELD(Peep, NoOfFood); diff --git a/src/openrct2/actions/StaffHireNewAction.hpp b/src/openrct2/actions/StaffHireNewAction.hpp index 94ea4cbfda..dd87c0fcff 100644 --- a/src/openrct2/actions/StaffHireNewAction.hpp +++ b/src/openrct2/actions/StaffHireNewAction.hpp @@ -170,7 +170,7 @@ private: newPeep->outside_of_park = 0; newPeep->peep_flags = 0; newPeep->paid_to_enter = 0; - newPeep->paid_on_rides = 0; + newPeep->PaidOnRides = 0; newPeep->PaidOnFood = 0; newPeep->PaidOnSouvenirs = 0; newPeep->FavouriteRide = RIDE_ID_NULL; diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index f02f1f1026..d29cb69d69 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -3867,7 +3867,7 @@ void Guest::UpdateRideFreeVehicleEnterRide(Ride* ride) { ride->total_profit += ridePrice; ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME; - SpendMoney(paid_on_rides, ridePrice, ExpenditureType::ParkRideTickets); + SpendMoney(PaidOnRides, ridePrice, ExpenditureType::ParkRideTickets); } } diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 17d16e0709..9d5f7bd427 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -1765,7 +1765,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords) peep->disgusting_count = 0; peep->VandalismSeen = 0; peep->paid_to_enter = 0; - peep->paid_on_rides = 0; + peep->PaidOnRides = 0; peep->PaidOnFood = 0; peep->paid_on_drink = 0; peep->PaidOnSouvenirs = 0; diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 5fceb4ab03..cf67a45d28 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -718,7 +718,7 @@ struct Peep : SpriteBase }; union { - money16 paid_on_rides; + money16 PaidOnRides; uint16_t StaffGardensWatered; uint16_t StaffRidesInspected; }; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 6c9568cc56..2d94c8a28f 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1489,7 +1489,7 @@ private: dst->NoOfSouvenirs = src->no_of_souvenirs; dst->paid_to_enter = src->paid_to_enter; - dst->paid_on_rides = src->paid_on_rides; + dst->PaidOnRides = src->paid_on_rides; dst->paid_on_drink = src->paid_on_drink; dst->PaidOnFood = src->paid_on_food; dst->PaidOnSouvenirs = src->paid_on_souvenirs; diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index b2138740f1..2e5cc829c9 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1222,7 +1222,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src) dst->time_on_ride = src->time_on_ride; dst->disgusting_count = src->disgusting_count; dst->paid_to_enter = src->paid_to_enter; - dst->paid_on_rides = src->paid_on_rides; + dst->paid_on_rides = src->PaidOnRides; dst->paid_on_food = src->PaidOnFood; dst->paid_on_souvenirs = src->PaidOnSouvenirs; dst->no_of_food = src->NoOfFood; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 487f8c053a..1afce9845f 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1487,7 +1487,7 @@ public: dst->time_on_ride = src->time_on_ride; dst->disgusting_count = src->disgusting_count; dst->paid_to_enter = src->paid_to_enter; - dst->paid_on_rides = src->paid_on_rides; + dst->PaidOnRides = src->paid_on_rides; dst->PaidOnFood = src->paid_on_food; dst->PaidOnSouvenirs = src->paid_on_souvenirs; dst->NoOfFood = src->no_of_food; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 77c5edb201..951b482ff6 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -248,7 +248,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right) COMPARE_FIELD(time_on_ride); COMPARE_FIELD(disgusting_count); COMPARE_FIELD(paid_to_enter); - COMPARE_FIELD(paid_on_rides); + COMPARE_FIELD(PaidOnRides); COMPARE_FIELD(PaidOnFood); COMPARE_FIELD(PaidOnSouvenirs); COMPARE_FIELD(NoOfFood);