diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 36c99e1c68..85847a7d8a 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -1822,8 +1822,8 @@ void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi) // Paid on drinks y += LIST_ROW_HEIGHT; set_format_arg(0, money32, peep->paid_on_drink); - set_format_arg(4, uint16_t, peep->no_of_drinks); - if (peep->no_of_drinks != 1) + set_format_arg(4, uint16_t, peep->NoOfDrinks); + if (peep->NoOfDrinks != 1) { gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_DRINK_PLURAL, gCommonFormatArgs, COLOUR_BLACK, x, y); } diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 17248a11f4..48f69a5c1e 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -299,7 +299,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots COMPARE_FIELD(Peep, paid_on_food); COMPARE_FIELD(Peep, paid_on_souvenirs); COMPARE_FIELD(Peep, no_of_food); - COMPARE_FIELD(Peep, no_of_drinks); + COMPARE_FIELD(Peep, NoOfDrinks); COMPARE_FIELD(Peep, NoOfSouvenirs); COMPARE_FIELD(Peep, VandalismSeen); COMPARE_FIELD(Peep, VoucherType); diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index c2fda68a19..d1462bf4e0 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -1699,7 +1699,7 @@ loc_69B221: no_of_food++; if (ShopItems[shopItem].IsDrink()) - no_of_drinks++; + NoOfDrinks++; if (ShopItems[shopItem].IsSouvenir()) NoOfSouvenirs++; diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 373d7dbecb..2f09bd698e 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -1770,7 +1770,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords) peep->paid_on_drink = 0; peep->paid_on_souvenirs = 0; peep->no_of_food = 0; - peep->no_of_drinks = 0; + peep->NoOfDrinks = 0; peep->NoOfSouvenirs = 0; peep->SurroundingsThoughtTimeout = 0; peep->Angriness = 0; diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 5ab7c61101..6b41163154 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -733,7 +733,7 @@ struct Peep : SpriteBase uint16_t staff_bins_emptied; }; uint8_t no_of_food; - uint8_t no_of_drinks; + uint8_t NoOfDrinks; uint8_t NoOfSouvenirs; uint8_t VandalismSeen; // 0xC0 vandalism thought timeout, 0x3F vandalism tiles seen uint8_t VoucherType; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 02fd698434..492a4d3dd5 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1484,7 +1484,7 @@ private: // This doubles as staff type dst->no_of_rides = src->no_of_rides; - dst->no_of_drinks = src->no_of_drinks; + dst->NoOfDrinks = src->no_of_drinks; dst->no_of_food = src->no_of_food; dst->NoOfSouvenirs = src->no_of_souvenirs; diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 482b2ceb83..eb6016a6b3 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1226,7 +1226,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src) dst->paid_on_food = src->paid_on_food; dst->paid_on_souvenirs = src->paid_on_souvenirs; dst->no_of_food = src->no_of_food; - dst->no_of_drinks = src->no_of_drinks; + dst->no_of_drinks = src->NoOfDrinks; dst->no_of_souvenirs = src->NoOfSouvenirs; dst->vandalism_seen = src->VandalismSeen; dst->voucher_type = src->VoucherType; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index e1e6aab6b4..ecfcbde585 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1491,7 +1491,7 @@ public: dst->paid_on_food = src->paid_on_food; dst->paid_on_souvenirs = src->paid_on_souvenirs; dst->no_of_food = src->no_of_food; - dst->no_of_drinks = src->no_of_drinks; + dst->NoOfDrinks = src->no_of_drinks; dst->NoOfSouvenirs = src->no_of_souvenirs; dst->VandalismSeen = src->vandalism_seen; dst->VoucherType = src->voucher_type; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 168f20168e..f635643f82 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -252,7 +252,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right) COMPARE_FIELD(paid_on_food); COMPARE_FIELD(paid_on_souvenirs); COMPARE_FIELD(no_of_food); - COMPARE_FIELD(no_of_drinks); + COMPARE_FIELD(NoOfDrinks); COMPARE_FIELD(NoOfSouvenirs); COMPARE_FIELD(VandalismSeen); COMPARE_FIELD(VoucherType);