diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 1e51bd375e..4864e5a2db 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -1792,7 +1792,7 @@ void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi) // Cash spent y += LIST_ROW_HEIGHT; ft = Formatter::Common(); - ft.Add(peep->cash_spent); + ft.Add(peep->CashSpent); gfx_draw_string_left(dpi, STR_GUEST_STAT_CASH_SPENT, gCommonFormatArgs, COLOUR_BLACK, x, y); y += LIST_ROW_HEIGHT * 2; diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 6cba345f77..f1e371e71c 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -271,7 +271,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots } COMPARE_FIELD(Peep, id); COMPARE_FIELD(Peep, cash_in_pocket); - COMPARE_FIELD(Peep, cash_spent); + COMPARE_FIELD(Peep, CashSpent); COMPARE_FIELD(Peep, TimeInPark); COMPARE_FIELD(Peep, RejoinQueueTimeout); COMPARE_FIELD(Peep, PreviousRide); diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index 7193ad2114..502379e757 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -2344,7 +2344,7 @@ void Guest::SpendMoney(money16& peep_expend_type, money32 amount, ExpenditureTyp assert(!(gParkFlags & PARK_FLAGS_NO_MONEY)); cash_in_pocket = std::max(0, cash_in_pocket - amount); - cash_spent += amount; + CashSpent += amount; peep_expend_type += static_cast(amount); diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index bcca8c6723..8af04ffe43 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -1752,7 +1752,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords) } peep->cash_in_pocket = cash; - peep->cash_spent = 0; + peep->CashSpent = 0; peep->TimeInPark = -1; peep->PathfindGoal.x = 0xFF; peep->PathfindGoal.y = 0xFF; diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 4d9577845e..d0478fa285 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -679,7 +679,7 @@ struct Peep : SpriteBase // window_peep_rides_update for how to use. uint32_t id; money32 cash_in_pocket; - money32 cash_spent; + money32 CashSpent; int32_t TimeInPark; int8_t RejoinQueueTimeout; // whilst waiting for a free vehicle (or pair) in the entrance uint8_t PreviousRide; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index aa3783aea3..98c5c2f50f 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1478,7 +1478,7 @@ private: dst->id = src->id; dst->cash_in_pocket = src->cash_in_pocket; - dst->cash_spent = src->cash_spent; + dst->CashSpent = src->cash_spent; dst->TimeInPark = src->time_in_park; // This doubles as staff type diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 6e4cc75d51..0ea6caac80 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1193,7 +1193,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src) } dst->id = src->id; dst->cash_in_pocket = src->cash_in_pocket; - dst->cash_spent = src->cash_spent; + dst->cash_spent = src->CashSpent; dst->time_in_park = src->TimeInPark; dst->rejoin_queue_timeout = src->RejoinQueueTimeout; dst->previous_ride = src->PreviousRide; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index f80b34a5bb..7c3ba5ed0e 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1458,7 +1458,7 @@ public: } dst->id = src->id; dst->cash_in_pocket = src->cash_in_pocket; - dst->cash_spent = src->cash_spent; + dst->CashSpent = src->cash_spent; dst->TimeInPark = src->time_in_park; dst->RejoinQueueTimeout = src->rejoin_queue_timeout; dst->PreviousRide = src->previous_ride; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 45bd96dcec..5c8fdb154b 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -215,7 +215,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right) } COMPARE_FIELD(id); COMPARE_FIELD(cash_in_pocket); - COMPARE_FIELD(cash_spent); + COMPARE_FIELD(CashSpent); COMPARE_FIELD(TimeInPark); COMPARE_FIELD(RejoinQueueTimeout); COMPARE_FIELD(PreviousRide);