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

Rename Peep::photo2_ride_ref to use TitleCase

This commit is contained in:
Tulio Leao 2020-06-07 22:30:41 -03:00
parent 397c1137db
commit 1ee5653c8c
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2015,7 +2015,7 @@ static rct_string_id window_guest_inventory_format_item(Peep* peep, int32_t item
ft.Add<uint32_t>(SPRITE_ID_PALETTE_COLOUR_1(peep->tshirt_colour) | ShopItems[item].Image);
break;
case SHOP_ITEM_PHOTO2:
ride = get_ride(peep->photo2_ride_ref);
ride = get_ride(peep->Photo2RideRef);
if (ride != nullptr)
ride->FormatNameTo(gCommonFormatArgs + 6);
break;

2
src/openrct2/GameStateSnapshots.cpp
View File

@ -247,7 +247,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, ride_types_been_on[i]);
}
COMPARE_FIELD(Peep, item_extra_flags);
COMPARE_FIELD(Peep, photo2_ride_ref);
COMPARE_FIELD(Peep, Photo2RideRef);
COMPARE_FIELD(Peep, Photo3RideRef);
COMPARE_FIELD(Peep, Photo4RideRef);
COMPARE_FIELD(Peep, CurrentRide);

2
src/openrct2/actions/RideDemolishAction.hpp
View File

@ -194,7 +194,7 @@ private:
}
if (peep->item_extra_flags & PEEP_ITEM_PHOTO2)
{
if (peep->photo2_ride_ref == _rideIndex)
if (peep->Photo2RideRef == _rideIndex)
{
peep->item_extra_flags &= ~PEEP_ITEM_PHOTO2;
}

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

@ -1673,7 +1673,7 @@ loc_69B221:
Photo1RideRef = ride->id;
if (shopItem == SHOP_ITEM_PHOTO2)
photo2_ride_ref = ride->id;
Photo2RideRef = ride->id;
if (shopItem == SHOP_ITEM_PHOTO3)
Photo3RideRef = ride->id;

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

@ -632,7 +632,7 @@ struct Peep : SpriteBase
money16 paid_on_drink;
uint8_t ride_types_been_on[16];
uint32_t item_extra_flags;
uint8_t photo2_ride_ref;
uint8_t Photo2RideRef;
uint8_t Photo3RideRef;
uint8_t Photo4RideRef;
uint8_t CurrentRide;

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

@ -1169,7 +1169,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->ride_types_been_on[i] = src->ride_types_been_on[i];
}
dst->item_extra_flags = src->item_extra_flags;
dst->photo2_ride_ref = src->photo2_ride_ref;
dst->photo2_ride_ref = src->Photo2RideRef;
dst->photo3_ride_ref = src->Photo3RideRef;
dst->photo4_ride_ref = src->Photo4RideRef;
dst->current_ride = src->CurrentRide;

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

@ -1434,7 +1434,7 @@ public:
dst->ride_types_been_on[i] = src->ride_types_been_on[i];
}
dst->item_extra_flags = src->item_extra_flags;
dst->photo2_ride_ref = src->photo2_ride_ref;
dst->Photo2RideRef = src->photo2_ride_ref;
dst->Photo3RideRef = src->photo3_ride_ref;
dst->Photo4RideRef = src->photo4_ride_ref;
dst->CurrentRide = src->current_ride;

2
test/tests/S6ImportExportTests.cpp
View File

@ -191,7 +191,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(ride_types_been_on[i]);
}
COMPARE_FIELD(item_extra_flags);
COMPARE_FIELD(photo2_ride_ref);
COMPARE_FIELD(Photo2RideRef);
COMPARE_FIELD(Photo3RideRef);
COMPARE_FIELD(Photo4RideRef);
COMPARE_FIELD(CurrentRide);