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

Rename Peep::previous_ride_time_out to use TitleCase

This commit is contained in:
Tulio Leao 2020-06-06 10:07:36 -03:00
parent e08c1b44b2
commit 7701b1827d
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/GameStateSnapshots.cpp
View File

@ -275,7 +275,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, time_in_park);
COMPARE_FIELD(Peep, rejoin_queue_timeout);
COMPARE_FIELD(Peep, previous_ride);
COMPARE_FIELD(Peep, previous_ride_time_out);
COMPARE_FIELD(Peep, PreviousRideTimeOut);
for (int i = 0; i < PEEP_MAX_THOUGHTS; i++)
{
COMPARE_FIELD(Peep, Thoughts[i]);

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

@ -2391,7 +2391,7 @@ void Guest::ChoseNotToGoOnRide(Ride* ride, bool peepAtRide, bool updateLastRide)
if (peepAtRide && updateLastRide)
{
previous_ride = ride->id;
previous_ride_time_out = 0;
PreviousRideTimeOut = 0;
}
if (ride->id == GuestHeadingToRideId)
@ -2426,7 +2426,7 @@ static void peep_tried_to_enter_full_queue(Peep* peep, Ride* ride)
{
ride->lifecycle_flags |= RIDE_LIFECYCLE_QUEUE_FULL;
peep->previous_ride = ride->id;
peep->previous_ride_time_out = 0;
peep->PreviousRideTimeOut = 0;
// Change status "Heading to" to "Walking" if queue is full
if (ride->id == peep->GuestHeadingToRideId)
{
@ -3397,7 +3397,7 @@ void Guest::UpdateBuying()
if (!item_bought)
{
previous_ride = current_ride;
previous_ride_time_out = 0;
PreviousRideTimeOut = 0;
}
else
{

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

@ -1113,7 +1113,7 @@ void Peep::Update()
if (type == PEEP_TYPE_GUEST)
{
if (previous_ride != RIDE_ID_NULL)
if (++previous_ride_time_out >= 720)
if (++PreviousRideTimeOut >= 720)
previous_ride = RIDE_ID_NULL;
peep_update_thoughts(this);

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

@ -683,7 +683,7 @@ struct Peep : SpriteBase
int32_t time_in_park;
int8_t rejoin_queue_timeout; // whilst waiting for a free vehicle (or pair) in the entrance
uint8_t previous_ride;
uint16_t previous_ride_time_out;
uint16_t PreviousRideTimeOut;
rct_peep_thought Thoughts[PEEP_MAX_THOUGHTS];
uint8_t PathCheckOptimisation; // see peep.checkForPath
union

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

@ -1523,7 +1523,7 @@ private:
}
dst->previous_ride = src->previous_ride;
dst->previous_ride_time_out = src->previous_ride_time_out;
dst->PreviousRideTimeOut = src->previous_ride_time_out;
dst->PathCheckOptimisation = 0;
dst->GuestHeadingToRideId = src->guest_heading_to_ride_id;

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

@ -1197,7 +1197,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->time_in_park = src->time_in_park;
dst->rejoin_queue_timeout = src->rejoin_queue_timeout;
dst->previous_ride = src->previous_ride;
dst->previous_ride_time_out = src->previous_ride_time_out;
dst->previous_ride_time_out = src->PreviousRideTimeOut;
for (size_t i = 0; i < std::size(src->Thoughts); i++)
{
auto srcThought = &src->Thoughts[i];

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

@ -1462,7 +1462,7 @@ public:
dst->time_in_park = src->time_in_park;
dst->rejoin_queue_timeout = src->rejoin_queue_timeout;
dst->previous_ride = src->previous_ride;
dst->previous_ride_time_out = src->previous_ride_time_out;
dst->PreviousRideTimeOut = src->previous_ride_time_out;
for (size_t i = 0; i < std::size(src->thoughts); i++)
{
auto srcThought = &src->thoughts[i];

2
test/tests/S6ImportExportTests.cpp
View File

@ -219,7 +219,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(time_in_park);
COMPARE_FIELD(rejoin_queue_timeout);
COMPARE_FIELD(previous_ride);
COMPARE_FIELD(previous_ride_time_out);
COMPARE_FIELD(PreviousRideTimeOut);
for (int i = 0; i < PEEP_MAX_THOUGHTS; i++)
{
COMPARE_FIELD(Thoughts[i].type);