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

Rename Peep::rejoin_queue_timeout to use TitleCase

This commit is contained in:
Tulio Leao 2020-06-06 10:12:40 -03:00
parent 3dad0fd500
commit 4c459fada3
6 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/GameStateSnapshots.cpp
View File

@ -273,7 +273,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, cash_in_pocket);
COMPARE_FIELD(Peep, cash_spent);
COMPARE_FIELD(Peep, time_in_park);
COMPARE_FIELD(Peep, rejoin_queue_timeout);
COMPARE_FIELD(Peep, RejoinQueueTimeout);
COMPARE_FIELD(Peep, PreviousRide);
COMPARE_FIELD(Peep, PreviousRideTimeOut);
for (int i = 0; i < PEEP_MAX_THOUGHTS; i++)

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

@ -2547,7 +2547,7 @@ void Guest::GoToRideEntrance(Ride* ride)
SetState(PEEP_STATE_ENTERING_RIDE);
sub_state = PEEP_RIDE_IN_ENTRANCE;
rejoin_queue_timeout = 0;
RejoinQueueTimeout = 0;
GuestTimeOnRide = 0;
RemoveFromQueue();
@ -3948,7 +3948,7 @@ void Guest::UpdateRideFreeVehicleCheck()
if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_NO_VEHICLES))
{
if (ride->status != RIDE_STATUS_OPEN || ride->vehicle_change_timeout != 0 || (++rejoin_queue_timeout) == 0)
if (ride->status != RIDE_STATUS_OPEN || ride->vehicle_change_timeout != 0 || (++RejoinQueueTimeout) == 0)
{
peep_update_ride_no_free_vehicle_rejoin_queue(this, ride);
return;
@ -4017,7 +4017,7 @@ void Guest::UpdateRideFreeVehicleCheck()
}
Vehicle* currentTrain = GET_VEHICLE(ride->vehicles[current_train]);
if (ride->status == RIDE_STATUS_OPEN && ++rejoin_queue_timeout != 0
if (ride->status == RIDE_STATUS_OPEN && ++RejoinQueueTimeout != 0
&& !currentTrain->UpdateFlag(VEHICLE_UPDATE_FLAG_TRAIN_READY_DEPART))
{
return;

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

@ -681,7 +681,7 @@ struct Peep : SpriteBase
money32 cash_in_pocket;
money32 cash_spent;
int32_t time_in_park;
int8_t rejoin_queue_timeout; // whilst waiting for a free vehicle (or pair) in the entrance
int8_t RejoinQueueTimeout; // whilst waiting for a free vehicle (or pair) in the entrance
uint8_t PreviousRide;
uint16_t PreviousRideTimeOut;
rct_peep_thought Thoughts[PEEP_MAX_THOUGHTS];

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

@ -1195,7 +1195,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->cash_in_pocket = src->cash_in_pocket;
dst->cash_spent = src->cash_spent;
dst->time_in_park = src->time_in_park;
dst->rejoin_queue_timeout = src->rejoin_queue_timeout;
dst->rejoin_queue_timeout = src->RejoinQueueTimeout;
dst->previous_ride = src->PreviousRide;
dst->previous_ride_time_out = src->PreviousRideTimeOut;
for (size_t i = 0; i < std::size(src->Thoughts); i++)

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

@ -1460,7 +1460,7 @@ public:
dst->cash_in_pocket = src->cash_in_pocket;
dst->cash_spent = src->cash_spent;
dst->time_in_park = src->time_in_park;
dst->rejoin_queue_timeout = src->rejoin_queue_timeout;
dst->RejoinQueueTimeout = src->rejoin_queue_timeout;
dst->PreviousRide = src->previous_ride;
dst->PreviousRideTimeOut = src->previous_ride_time_out;
for (size_t i = 0; i < std::size(src->thoughts); i++)

2
test/tests/S6ImportExportTests.cpp
View File

@ -217,7 +217,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(cash_in_pocket);
COMPARE_FIELD(cash_spent);
COMPARE_FIELD(time_in_park);
COMPARE_FIELD(rejoin_queue_timeout);
COMPARE_FIELD(RejoinQueueTimeout);
COMPARE_FIELD(PreviousRide);
COMPARE_FIELD(PreviousRideTimeOut);
for (int i = 0; i < PEEP_MAX_THOUGHTS; i++)