From 1376dc45c0c7866a0a140e59cf95f0fbf13a3a73 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Sun, 7 Jun 2020 21:48:05 -0300 Subject: [PATCH] Rename Peep::current_seat to CurrentSeat --- src/openrct2/peep/Guest.cpp | 38 ++++++++++++++++---------------- src/openrct2/peep/Peep.cpp | 4 ++-- src/openrct2/peep/Peep.h | 2 +- src/openrct2/rct1/S4Importer.cpp | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index c5909adc9b..b586bbaa27 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -2497,11 +2497,11 @@ static void peep_choose_seat_from_car(Peep* peep, Ride* ride, Vehicle* vehicle) chosen_seat++; } } - peep->current_seat = chosen_seat; + peep->CurrentSeat = chosen_seat; vehicle->next_free_seat++; - vehicle->peep[peep->current_seat] = peep->sprite_index; - vehicle->peep_tshirt_colours[peep->current_seat] = peep->tshirt_colour; + vehicle->peep[peep->CurrentSeat] = peep->sprite_index; + vehicle->peep_tshirt_colours[peep->CurrentSeat] = peep->tshirt_colour; } /** @@ -3593,8 +3593,8 @@ static uint8_t peep_get_waypointed_seat_location( // The seatlocation can be split into segments around the ride base // to decide the segment first split off the segmentable seat location // from the fixed section - uint8_t seatLocationSegment = peep->current_seat & 0x7; - uint8_t seatLocationFixed = peep->current_seat & 0xF8; + uint8_t seatLocationSegment = peep->CurrentSeat & 0x7; + uint8_t seatLocationFixed = peep->CurrentSeat & 0xF8; // Enterprise has more segments (8) compared to the normal (4) if (ride->type != RIDE_TYPE_ENTERPRISE) @@ -3771,9 +3771,9 @@ void Guest::UpdateRideAdvanceThroughEntrance() if (numSeatPositions != 0) { size_t loadPositionIndex = numSeatPositions - 1; - if (current_seat < numSeatPositions) + if (CurrentSeat < numSeatPositions) { - loadPositionIndex = current_seat; + loadPositionIndex = CurrentSeat; } load_position = vehicle_type->peep_loading_positions[loadPositionIndex]; } @@ -3999,7 +3999,7 @@ void Guest::UpdateRideFreeVehicleCheck() if (ride->mode == RIDE_MODE_FORWARD_ROTATION || ride->mode == RIDE_MODE_BACKWARD_ROTATION) { - if (current_seat & 1 || !(vehicle->next_free_seat & 1)) + if (CurrentSeat & 1 || !(vehicle->next_free_seat & 1)) { UpdateRideFreeVehicleEnterRide(ride); return; @@ -4007,7 +4007,7 @@ void Guest::UpdateRideFreeVehicleCheck() } else { - uint8_t seat = current_seat | 1; + uint8_t seat = CurrentSeat | 1; if (seat < vehicle->next_free_seat) { UpdateRideFreeVehicleEnterRide(ride); @@ -4024,12 +4024,12 @@ void Guest::UpdateRideFreeVehicleCheck() if (ride->mode != RIDE_MODE_FORWARD_ROTATION && ride->mode != RIDE_MODE_BACKWARD_ROTATION) { - if (vehicle->next_free_seat - 1 != current_seat) + if (vehicle->next_free_seat - 1 != CurrentSeat) return; } vehicle->next_free_seat--; - vehicle->peep[current_seat] = SPRITE_INDEX_NULL; + vehicle->peep[CurrentSeat] = SPRITE_INDEX_NULL; peep_update_ride_no_free_vehicle_rejoin_queue(this, ride); } @@ -4059,13 +4059,13 @@ void Guest::UpdateRideEnterVehicle() if (ride->mode != RIDE_MODE_FORWARD_ROTATION && ride->mode != RIDE_MODE_BACKWARD_ROTATION) { - if (current_seat != vehicle->num_peeps) + if (CurrentSeat != vehicle->num_peeps) return; } if (vehicle->IsUsedInPairs()) { - auto* seatedPeep = GET_PEEP(vehicle->peep[current_seat ^ 1]); + auto* seatedPeep = GET_PEEP(vehicle->peep[CurrentSeat ^ 1]); if (seatedPeep != nullptr) { auto* seatedPeepAsGuest = seatedPeep->AsGuest(); @@ -4122,7 +4122,7 @@ void Guest::UpdateRideLeaveVehicle() // Check if ride is NOT Ferris Wheel. if (ride->mode != RIDE_MODE_FORWARD_ROTATION && ride->mode != RIDE_MODE_BACKWARD_ROTATION) { - if (vehicle->num_peeps - 1 != current_seat) + if (vehicle->num_peeps - 1 != CurrentSeat) return; } @@ -4227,9 +4227,9 @@ void Guest::UpdateRideLeaveVehicle() platformLocation.y = vehicle->y + DirectionOffsets[platformLocation.direction].y * 12; // This can evaluate to false with buggy custom rides. - if (current_seat < vehicle_entry->peep_loading_positions.size()) + if (CurrentSeat < vehicle_entry->peep_loading_positions.size()) { - int8_t loadPosition = vehicle_entry->peep_loading_positions[current_seat]; + int8_t loadPosition = vehicle_entry->peep_loading_positions[CurrentSeat]; switch (vehicle->sprite_direction / 8) { @@ -4250,7 +4250,7 @@ void Guest::UpdateRideLeaveVehicle() else { log_verbose( - "current_seat %d is too large! (Vehicle entry has room for %d.)", current_seat, + "CurrentSeat %d is too large! (Vehicle entry has room for %d.)", CurrentSeat, vehicle_entry->peep_loading_positions.size()); } @@ -5506,7 +5506,7 @@ void Guest::UpdateWalking() chosen_position = (chosen_position + 1) & 3; current_ride = ride_to_view; - current_seat = ride_seat_to_view; + CurrentSeat = ride_seat_to_view; var_37 = chosen_edge | (chosen_position << 2); SetState(PEEP_STATE_WATCHING); @@ -5519,7 +5519,7 @@ void Guest::UpdateWalking() destination_y = destY; destination_tolerance = 3; - if (current_seat & 1) + if (CurrentSeat & 1) { InsertNewThought(PEEP_THOUGHT_TYPE_NEW_RIDE, PEEP_THOUGHT_ITEM_NONE); } diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 4362f91a6e..536d916564 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -1865,13 +1865,13 @@ void Peep::FormatActionTo(void* argsV) const auto ride = get_ride(current_ride); if (ride != nullptr) { - ft.Add((current_seat & 0x1) ? STR_WATCHING_CONSTRUCTION_OF : STR_WATCHING_RIDE); + ft.Add((CurrentSeat & 0x1) ? STR_WATCHING_CONSTRUCTION_OF : STR_WATCHING_RIDE); ride->FormatNameTo(ft.Buf()); } } else { - ft.Add((current_seat & 0x1) ? STR_WATCHING_NEW_RIDE_BEING_CONSTRUCTED : STR_LOOKING_AT_SCENERY); + ft.Add((CurrentSeat & 0x1) ? STR_WATCHING_NEW_RIDE_BEING_CONSTRUCTED : STR_LOOKING_AT_SCENERY); } break; case PEEP_STATE_PICKED: diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index b2f00f3da4..d8c761a701 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -643,7 +643,7 @@ struct Peep : SpriteBase struct { uint8_t current_car; - uint8_t current_seat; + uint8_t CurrentSeat; }; uint16_t TimeToSitdown; struct diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 41ac88dcbd..089c933817 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1470,7 +1470,7 @@ private: dst->current_ride_station = src->current_ride_station; dst->current_train = src->current_train; dst->current_car = src->current_car; - dst->current_seat = src->current_seat; + dst->CurrentSeat = src->current_seat; dst->GuestTimeOnRide = src->time_on_ride; dst->DaysInQueue = src->days_in_queue;