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

Rename Peep::photo1_ride_ref to Photo1RideRef

This commit is contained in:
Tulio Leao 2020-05-31 17:49:56 -03:00 committed by Gymnasiast
parent a2a0fad886
commit 7357eeca60
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1947,7 +1947,7 @@ static rct_string_id window_guest_inventory_format_item(Peep* peep, int32_t item
set_format_arg(0, uint32_t, SPRITE_ID_PALETTE_COLOUR_1(peep->BalloonColour) | ShopItems[item].Image);
break;
case SHOP_ITEM_PHOTO:
ride = get_ride(peep->photo1_ride_ref);
ride = get_ride(peep->Photo1RideRef);
if (ride != nullptr)
ride->FormatNameTo(gCommonFormatArgs + 6);
break;

2
src/openrct2/GameStateSnapshots.cpp
View File

@ -283,7 +283,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, path_check_optimisation);
COMPARE_FIELD(Peep, guest_heading_to_ride_id);
COMPARE_FIELD(Peep, staff_orders);
COMPARE_FIELD(Peep, photo1_ride_ref);
COMPARE_FIELD(Peep, Photo1RideRef);
COMPARE_FIELD(Peep, PeepFlags);
COMPARE_FIELD(Peep, PathfindGoal);
for (int i = 0; i < 4; i++)

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

@ -187,7 +187,7 @@ private:
// remove any photos of this ride from peep
if (peep->ItemStandardFlags & PEEP_ITEM_PHOTO)
{
if (peep->photo1_ride_ref == _rideIndex)
if (peep->Photo1RideRef == _rideIndex)
{
peep->ItemStandardFlags &= ~PEEP_ITEM_PHOTO;
}

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

@ -1671,7 +1671,7 @@ loc_69B221:
time_to_consume = std::min((time_to_consume + consumptionTime), 255);
if (shopItem == SHOP_ITEM_PHOTO)
photo1_ride_ref = ride->id;
Photo1RideRef = ride->id;
if (shopItem == SHOP_ITEM_PHOTO2)
photo2_ride_ref = ride->id;

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

@ -696,7 +696,7 @@ struct Peep : SpriteBase
uint8_t staff_orders;
uint8_t peep_is_lost_countdown;
};
uint8_t photo1_ride_ref;
uint8_t Photo1RideRef;
uint32_t PeepFlags;
rct12_xyzd8 PathfindGoal;
rct12_xyzd8 PathfindHistory[4];

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

@ -1510,7 +1510,7 @@ private:
dst->ride_types_been_on[i] = src->ride_types_been_on[i];
}
dst->photo1_ride_ref = src->photo1_ride_ref;
dst->Photo1RideRef = src->photo1_ride_ref;
for (size_t i = 0; i < std::size(src->thoughts); i++)
{

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

@ -1210,7 +1210,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->path_check_optimisation = src->path_check_optimisation;
dst->guest_heading_to_ride_id = src->guest_heading_to_ride_id;
dst->peep_is_lost_countdown = src->peep_is_lost_countdown;
dst->photo1_ride_ref = src->photo1_ride_ref;
dst->photo1_ride_ref = src->Photo1RideRef;
dst->peep_flags = src->PeepFlags;
dst->pathfind_goal = src->PathfindGoal;
for (size_t i = 0; i < std::size(src->PathfindHistory); i++)

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

@ -1475,7 +1475,7 @@ public:
dst->path_check_optimisation = src->path_check_optimisation;
dst->guest_heading_to_ride_id = src->guest_heading_to_ride_id;
dst->peep_is_lost_countdown = src->peep_is_lost_countdown;
dst->photo1_ride_ref = src->photo1_ride_ref;
dst->Photo1RideRef = src->photo1_ride_ref;
dst->PeepFlags = src->peep_flags;
dst->PathfindGoal = src->pathfind_goal;
for (size_t i = 0; i < std::size(src->pathfind_history); i++)

2
test/tests/S6ImportExportTests.cpp
View File

@ -230,7 +230,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(path_check_optimisation);
COMPARE_FIELD(guest_heading_to_ride_id);
COMPARE_FIELD(staff_orders);
COMPARE_FIELD(photo1_ride_ref);
COMPARE_FIELD(Photo1RideRef);
COMPARE_FIELD(PeepFlags);
COMPARE_FIELD(PathfindGoal.x);
COMPARE_FIELD(PathfindGoal.y);