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

Rename Peep::photo3_ride_ref to use TitleCase

This commit is contained in:
Tulio Leao 2020-06-07 22:28:19 -03:00
parent df87daaa6e
commit 397c1137db
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

@ -2020,7 +2020,7 @@ static rct_string_id window_guest_inventory_format_item(Peep* peep, int32_t item
ride->FormatNameTo(gCommonFormatArgs + 6);
break;
case SHOP_ITEM_PHOTO3:
ride = get_ride(peep->photo3_ride_ref);
ride = get_ride(peep->Photo3RideRef);
if (ride != nullptr)
ride->FormatNameTo(gCommonFormatArgs + 6);
break;

2
src/openrct2/GameStateSnapshots.cpp
View File

@ -248,7 +248,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
}
COMPARE_FIELD(Peep, item_extra_flags);
COMPARE_FIELD(Peep, photo2_ride_ref);
COMPARE_FIELD(Peep, photo3_ride_ref);
COMPARE_FIELD(Peep, Photo3RideRef);
COMPARE_FIELD(Peep, Photo4RideRef);
COMPARE_FIELD(Peep, CurrentRide);
COMPARE_FIELD(Peep, CurrentRideStation);

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

@ -201,7 +201,7 @@ private:
}
if (peep->item_extra_flags & PEEP_ITEM_PHOTO3)
{
if (peep->photo3_ride_ref == _rideIndex)
if (peep->Photo3RideRef == _rideIndex)
{
peep->item_extra_flags &= ~PEEP_ITEM_PHOTO3;
}

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

@ -1676,7 +1676,7 @@ loc_69B221:
photo2_ride_ref = ride->id;
if (shopItem == SHOP_ITEM_PHOTO3)
photo3_ride_ref = ride->id;
Photo3RideRef = ride->id;
if (shopItem == SHOP_ITEM_PHOTO4)
Photo4RideRef = ride->id;

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

@ -633,7 +633,7 @@ struct Peep : SpriteBase
uint8_t ride_types_been_on[16];
uint32_t item_extra_flags;
uint8_t photo2_ride_ref;
uint8_t photo3_ride_ref;
uint8_t Photo3RideRef;
uint8_t Photo4RideRef;
uint8_t CurrentRide;
StationIndex CurrentRideStation;

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

@ -1170,7 +1170,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
}
dst->item_extra_flags = src->item_extra_flags;
dst->photo2_ride_ref = src->photo2_ride_ref;
dst->photo3_ride_ref = src->photo3_ride_ref;
dst->photo3_ride_ref = src->Photo3RideRef;
dst->photo4_ride_ref = src->Photo4RideRef;
dst->current_ride = src->CurrentRide;
dst->current_ride_station = src->CurrentRideStation;

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

@ -1435,7 +1435,7 @@ public:
}
dst->item_extra_flags = src->item_extra_flags;
dst->photo2_ride_ref = src->photo2_ride_ref;
dst->photo3_ride_ref = src->photo3_ride_ref;
dst->Photo3RideRef = src->photo3_ride_ref;
dst->Photo4RideRef = src->photo4_ride_ref;
dst->CurrentRide = src->current_ride;
dst->CurrentRideStation = src->current_ride_station;

2
test/tests/S6ImportExportTests.cpp
View File

@ -192,7 +192,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
}
COMPARE_FIELD(item_extra_flags);
COMPARE_FIELD(photo2_ride_ref);
COMPARE_FIELD(photo3_ride_ref);
COMPARE_FIELD(Photo3RideRef);
COMPARE_FIELD(Photo4RideRef);
COMPARE_FIELD(CurrentRide);
COMPARE_FIELD(CurrentRideStation);