diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 826db59a94..970bd1e6f9 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -292,7 +292,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots } COMPARE_FIELD(Peep, no_action_frame_num); COMPARE_FIELD(Peep, litter_count); - COMPARE_FIELD(Peep, time_on_ride); + COMPARE_FIELD(Peep, TimeOnRide); COMPARE_FIELD(Peep, DisgustingCount); COMPARE_FIELD(Peep, PaidToEnter); COMPARE_FIELD(Peep, PaidOnRides); diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index 6588106aeb..befe288de4 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -776,18 +776,18 @@ void Guest::Tick128UpdateGuest(int32_t index) if (state == PEEP_STATE_ON_RIDE || state == PEEP_STATE_ENTERING_RIDE) { - time_on_ride = std::min(255, time_on_ride + 1); + TimeOnRide = std::min(255, TimeOnRide + 1); if (peep_flags & PEEP_FLAGS_WOW) { InsertNewThought(PEEP_THOUGHT_TYPE_WOW2, PEEP_THOUGHT_ITEM_NONE); } - if (time_on_ride > 15) + if (TimeOnRide > 15) { happiness_target = std::max(0, happiness_target - 5); - if (time_on_ride > 22) + if (TimeOnRide > 22) { auto ride = get_ride(current_ride); if (ride != nullptr) @@ -2548,7 +2548,7 @@ void Guest::GoToRideEntrance(Ride* ride) sub_state = PEEP_RIDE_IN_ENTRANCE; rejoin_queue_timeout = 0; - time_on_ride = 0; + TimeOnRide = 0; RemoveFromQueue(); } @@ -4079,7 +4079,7 @@ void Guest::UpdateRideEnterVehicle() vehicle->mass += seatedPeepAsGuest->mass; seatedPeepAsGuest->MoveTo({ LOCATION_NULL, 0, 0 }); seatedPeepAsGuest->SetState(PEEP_STATE_ON_RIDE); - seatedPeepAsGuest->time_on_ride = 0; + seatedPeepAsGuest->TimeOnRide = 0; seatedPeepAsGuest->sub_state = PEEP_RIDE_ON_RIDE; seatedPeepAsGuest->OnEnterRide(current_ride); } @@ -4095,7 +4095,7 @@ void Guest::UpdateRideEnterVehicle() SetState(PEEP_STATE_ON_RIDE); - time_on_ride = 0; + TimeOnRide = 0; sub_state = PEEP_RIDE_ON_RIDE; OnEnterRide(current_ride); } diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 35fa391ba3..aaa05dd10a 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -2976,7 +2976,7 @@ static bool peep_interact_with_shop(Peep* peep, int16_t x, int16_t y, TileElemen peep->SetState(PEEP_STATE_ENTERING_RIDE); peep->sub_state = PEEP_SHOP_APPROACH; - peep->time_on_ride = 0; + peep->TimeOnRide = 0; ride->cur_num_customers++; if (peep->peep_flags & PEEP_FLAGS_TRACKING) { diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 571f99b5d9..3fef87181a 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -705,7 +705,7 @@ struct Peep : SpriteBase uint8_t litter_count; union { - uint8_t time_on_ride; + uint8_t TimeOnRide; uint8_t StaffMowingTimeout; }; // 0x3F Sick Count split into lots of 3 with time, 0xC0 Time since last recalc diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index bb6a9a765c..ff7fea37b1 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1471,7 +1471,7 @@ private: dst->current_train = src->current_train; dst->current_car = src->current_car; dst->current_seat = src->current_seat; - dst->time_on_ride = src->time_on_ride; + dst->TimeOnRide = src->time_on_ride; dst->DaysInQueue = src->days_in_queue; dst->interaction_ride_index = src->interaction_ride_index; diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index cf9563d244..4bf3048b0c 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1219,7 +1219,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src) } dst->no_action_frame_num = src->no_action_frame_num; dst->litter_count = src->litter_count; - dst->time_on_ride = src->time_on_ride; + dst->time_on_ride = src->TimeOnRide; dst->disgusting_count = src->DisgustingCount; dst->paid_to_enter = src->PaidToEnter; dst->paid_on_rides = src->PaidOnRides; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 58cfd0c5f4..480885794e 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1484,7 +1484,7 @@ public: } dst->no_action_frame_num = src->no_action_frame_num; dst->litter_count = src->litter_count; - dst->time_on_ride = src->time_on_ride; + dst->TimeOnRide = src->time_on_ride; dst->DisgustingCount = src->disgusting_count; dst->PaidToEnter = src->paid_to_enter; dst->PaidOnRides = src->paid_on_rides; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index c3186b1ec5..a99c2419c4 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -245,7 +245,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right) } COMPARE_FIELD(no_action_frame_num); COMPARE_FIELD(litter_count); - COMPARE_FIELD(time_on_ride); + COMPARE_FIELD(TimeOnRide); COMPARE_FIELD(DisgustingCount); COMPARE_FIELD(PaidToEnter); COMPARE_FIELD(PaidOnRides);