mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename NoOf... to AmountOf... on Peep

This commit is contained in:
Tulio Leao 2020-05-31 09:05:10 -03:00
parent 0c502988ef
commit e18abc7e3d
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2-ui/windows/Guest.cpp
View File

@ -1809,8 +1809,8 @@ void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi)
// Paid on food
y += LIST_ROW_HEIGHT;
set_format_arg(0, money32, peep->PaidOnFood);
set_format_arg(4, uint16_t, peep->NoOfFood);
if (peep->NoOfFood != 1)
set_format_arg(4, uint16_t, peep->AmountOfFood);
if (peep->AmountOfFood != 1)
{
gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_FOOD_PLURAL, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
@ -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->NoOfDrinks);
if (peep->NoOfDrinks != 1)
set_format_arg(4, uint16_t, peep->AmountOfDrinks);
if (peep->AmountOfDrinks != 1)
{
gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_DRINK_PLURAL, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
@ -1835,8 +1835,8 @@ void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi)
// Paid on souvenirs
y += LIST_ROW_HEIGHT;
set_format_arg(0, money32, peep->PaidOnSouvenirs);
set_format_arg(4, uint16_t, peep->NoOfSouvenirs);
if (peep->NoOfSouvenirs != 1)
set_format_arg(4, uint16_t, peep->AmountOfSouvenirs);
if (peep->AmountOfSouvenirs != 1)
{
gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_SOUVENIR_PLURAL, gCommonFormatArgs, COLOUR_BLACK, x, y);
}

6
src/openrct2/GameStateSnapshots.cpp
View File

@ -298,9 +298,9 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, PaidOnRides);
COMPARE_FIELD(Peep, PaidOnFood);
COMPARE_FIELD(Peep, PaidOnSouvenirs);
COMPARE_FIELD(Peep, NoOfFood);
COMPARE_FIELD(Peep, NoOfDrinks);
COMPARE_FIELD(Peep, NoOfSouvenirs);
COMPARE_FIELD(Peep, AmountOfFood);
COMPARE_FIELD(Peep, AmountOfDrinks);
COMPARE_FIELD(Peep, AmountOfSouvenirs);
COMPARE_FIELD(Peep, VandalismSeen);
COMPARE_FIELD(Peep, VoucherType);
COMPARE_FIELD(Peep, VoucherArguments);

6
src/openrct2/peep/Guest.cpp
View File

@ -1696,13 +1696,13 @@ loc_69B221:
}
if (ShopItems[shopItem].IsFood())
NoOfFood++;
AmountOfFood++;
if (ShopItems[shopItem].IsDrink())
NoOfDrinks++;
AmountOfDrinks++;
if (ShopItems[shopItem].IsSouvenir())
NoOfSouvenirs++;
AmountOfSouvenirs++;
money16* expend_type = &PaidOnSouvenirs;
ExpenditureType expenditure = ExpenditureType::ShopStock;

6
src/openrct2/peep/Peep.cpp
View File

@ -1769,9 +1769,9 @@ Peep* Peep::Generate(const CoordsXYZ& coords)
peep->PaidOnFood = 0;
peep->paid_on_drink = 0;
peep->PaidOnSouvenirs = 0;
peep->NoOfFood = 0;
peep->NoOfDrinks = 0;
peep->NoOfSouvenirs = 0;
peep->AmountOfFood = 0;
peep->AmountOfDrinks = 0;
peep->AmountOfSouvenirs = 0;
peep->SurroundingsThoughtTimeout = 0;
peep->Angriness = 0;
peep->TimeLost = 0;

6
src/openrct2/peep/Peep.h
View File

@ -732,9 +732,9 @@ struct Peep : SpriteBase
money16 PaidOnSouvenirs;
uint16_t StaffBinsEmptied;
};
uint8_t NoOfFood;
uint8_t NoOfDrinks;
uint8_t NoOfSouvenirs;
uint8_t AmountOfFood;
uint8_t AmountOfDrinks;
uint8_t AmountOfSouvenirs;
uint8_t VandalismSeen; // 0xC0 vandalism thought timeout, 0x3F vandalism tiles seen
uint8_t VoucherType;
uint8_t VoucherArguments; // ride_id or string_offset_id

6
src/openrct2/rct1/S4Importer.cpp
View File

@ -1484,9 +1484,9 @@ private:
// This doubles as staff type
dst->no_of_rides = src->no_of_rides;
dst->NoOfDrinks = src->no_of_drinks;
dst->NoOfFood = src->no_of_food;
dst->NoOfSouvenirs = src->no_of_souvenirs;
dst->AmountOfDrinks = src->no_of_drinks;
dst->AmountOfFood = src->no_of_food;
dst->AmountOfSouvenirs = src->no_of_souvenirs;
dst->PaidToEnter = src->paid_to_enter;
dst->PaidOnRides = src->paid_on_rides;

6
src/openrct2/rct2/S6Exporter.cpp
View File

@ -1225,9 +1225,9 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->paid_on_rides = src->PaidOnRides;
dst->paid_on_food = src->PaidOnFood;
dst->paid_on_souvenirs = src->PaidOnSouvenirs;
dst->no_of_food = src->NoOfFood;
dst->no_of_drinks = src->NoOfDrinks;
dst->no_of_souvenirs = src->NoOfSouvenirs;
dst->no_of_food = src->AmountOfFood;
dst->no_of_drinks = src->AmountOfDrinks;
dst->no_of_souvenirs = src->AmountOfSouvenirs;
dst->vandalism_seen = src->VandalismSeen;
dst->voucher_type = src->VoucherType;
dst->voucher_arguments = src->VoucherArguments;

6
src/openrct2/rct2/S6Importer.cpp
View File

@ -1490,9 +1490,9 @@ public:
dst->PaidOnRides = src->paid_on_rides;
dst->PaidOnFood = src->paid_on_food;
dst->PaidOnSouvenirs = src->paid_on_souvenirs;
dst->NoOfFood = src->no_of_food;
dst->NoOfDrinks = src->no_of_drinks;
dst->NoOfSouvenirs = src->no_of_souvenirs;
dst->AmountOfFood = src->no_of_food;
dst->AmountOfDrinks = src->no_of_drinks;
dst->AmountOfSouvenirs = src->no_of_souvenirs;
dst->VandalismSeen = src->vandalism_seen;
dst->VoucherType = src->voucher_type;
dst->VoucherArguments = src->voucher_arguments;

6
test/tests/S6ImportExportTests.cpp
View File

@ -251,9 +251,9 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(PaidOnRides);
COMPARE_FIELD(PaidOnFood);
COMPARE_FIELD(PaidOnSouvenirs);
COMPARE_FIELD(NoOfFood);
COMPARE_FIELD(NoOfDrinks);
COMPARE_FIELD(NoOfSouvenirs);
COMPARE_FIELD(AmountOfFood);
COMPARE_FIELD(AmountOfDrinks);
COMPARE_FIELD(AmountOfSouvenirs);
COMPARE_FIELD(VandalismSeen);
COMPARE_FIELD(VoucherType);
COMPARE_FIELD(VoucherArguments);