mirror of https://github.com/OpenRCT2/OpenRCT2.git
Rename Peep::paid_on_drink to PaidOnDrink
This commit is contained in:
parent
61a598edba
commit
1c566eebcb
|
@ -1834,7 +1834,7 @@ void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi)
|
|||
// Paid on drinks
|
||||
y += LIST_ROW_HEIGHT;
|
||||
ft = Formatter::Common();
|
||||
ft.Add<money32>(peep->paid_on_drink);
|
||||
ft.Add<money32>(peep->PaidOnDrink);
|
||||
ft.Add<uint16_t>(peep->AmountOfDrinks);
|
||||
if (peep->AmountOfDrinks != 1)
|
||||
{
|
||||
|
|
|
@ -241,7 +241,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
|
|||
COMPARE_FIELD(Peep, intensity);
|
||||
COMPARE_FIELD(Peep, nausea_tolerance);
|
||||
COMPARE_FIELD(Peep, window_invalidate_flags);
|
||||
COMPARE_FIELD(Peep, paid_on_drink);
|
||||
COMPARE_FIELD(Peep, PaidOnDrink);
|
||||
for (int i = 0; i < 16; i++)
|
||||
{
|
||||
COMPARE_FIELD(Peep, RideTypesBeenOn[i]);
|
||||
|
|
|
@ -1714,7 +1714,7 @@ loc_69B221:
|
|||
|
||||
if (ShopItems[shopItem].IsDrink())
|
||||
{
|
||||
expend_type = &paid_on_drink;
|
||||
expend_type = &PaidOnDrink;
|
||||
expenditure = ExpenditureType::FoodDrinkStock;
|
||||
}
|
||||
|
||||
|
|
|
@ -1757,7 +1757,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords)
|
|||
peep->PaidToEnter = 0;
|
||||
peep->PaidOnRides = 0;
|
||||
peep->PaidOnFood = 0;
|
||||
peep->paid_on_drink = 0;
|
||||
peep->PaidOnDrink = 0;
|
||||
peep->PaidOnSouvenirs = 0;
|
||||
peep->AmountOfFood = 0;
|
||||
peep->AmountOfDrinks = 0;
|
||||
|
|
|
@ -629,7 +629,7 @@ struct Peep : SpriteBase
|
|||
IntensityRange intensity;
|
||||
uint8_t nausea_tolerance;
|
||||
uint8_t window_invalidate_flags;
|
||||
money16 paid_on_drink;
|
||||
money16 PaidOnDrink;
|
||||
uint8_t RideTypesBeenOn[16];
|
||||
uint32_t ItemExtraFlags;
|
||||
uint8_t Photo2RideRef;
|
||||
|
|
|
@ -1490,7 +1490,7 @@ private:
|
|||
|
||||
dst->PaidToEnter = src->paid_to_enter;
|
||||
dst->PaidOnRides = src->paid_on_rides;
|
||||
dst->paid_on_drink = src->paid_on_drink;
|
||||
dst->PaidOnDrink = src->paid_on_drink;
|
||||
dst->PaidOnFood = src->paid_on_food;
|
||||
dst->PaidOnSouvenirs = src->paid_on_souvenirs;
|
||||
|
||||
|
|
|
@ -1163,7 +1163,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
|
|||
dst->intensity = static_cast<uint8_t>(src->intensity);
|
||||
dst->nausea_tolerance = src->nausea_tolerance;
|
||||
dst->window_invalidate_flags = src->window_invalidate_flags;
|
||||
dst->paid_on_drink = src->paid_on_drink;
|
||||
dst->paid_on_drink = src->PaidOnDrink;
|
||||
for (size_t i = 0; i < std::size(src->RideTypesBeenOn); i++)
|
||||
{
|
||||
dst->ride_types_been_on[i] = src->RideTypesBeenOn[i];
|
||||
|
|
|
@ -1428,7 +1428,7 @@ public:
|
|||
dst->intensity = static_cast<IntensityRange>(src->intensity);
|
||||
dst->nausea_tolerance = src->nausea_tolerance;
|
||||
dst->window_invalidate_flags = src->window_invalidate_flags;
|
||||
dst->paid_on_drink = src->paid_on_drink;
|
||||
dst->PaidOnDrink = src->paid_on_drink;
|
||||
for (size_t i = 0; i < std::size(src->ride_types_been_on); i++)
|
||||
{
|
||||
dst->RideTypesBeenOn[i] = src->ride_types_been_on[i];
|
||||
|
|
|
@ -185,7 +185,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
|
|||
COMPARE_FIELD(intensity);
|
||||
COMPARE_FIELD(nausea_tolerance);
|
||||
COMPARE_FIELD(window_invalidate_flags);
|
||||
COMPARE_FIELD(paid_on_drink);
|
||||
COMPARE_FIELD(PaidOnDrink);
|
||||
for (int i = 0; i < PEEP_MAX_THOUGHTS; i++)
|
||||
{
|
||||
COMPARE_FIELD(RideTypesBeenOn[i]);
|
||||
|
|
Loading…
Reference in New Issue