mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Reformat the ifs, remove unnecessary parameter

Browse Source
This commit is contained in:
Gymnasiast
2022-07-01 23:26:40 +02:00
parent d936aa48e1
commit d42e67ddfe
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/openrct2/ride/Vehicle.cpp
View File

@@ -3011,25 +3011,34 @@ void Vehicle::TestReset()
test_reset(*curRide, current_station);
}
bool Vehicle::CurrentTowerElementIsTop(RideId currentRideId)
// The result of this function is used to decide whether a vehicle on a tower ride should go further up or not.
// Therefore, it will return true if anything is amiss.
bool Vehicle::CurrentTowerElementIsTop()
{
TileElement* tileElement = map_get_track_element_at_of_type(TrackLocation, GetTrackType());
if (tileElement != nullptr)
if (tileElement == nullptr)
return true;
while (!tileElement->IsLastForTile())
{
while (!tileElement->IsLastForTile())
{
tileElement++;
if (tileElement->GetType() == TileElementType::Track && !tileElement->IsGhost())
{
const auto* trackElement = tileElement->AsTrack();
if (trackElement->GetRideIndex() == currentRideId
&& trackElement->GetTrackType() == TrackElemType::TowerSection)
{
return false;
}
}
}
tileElement++;
if (tileElement->IsGhost())
continue;
if (tileElement->GetType() != TileElementType::Track)
continue;
const auto* trackElement = tileElement->AsTrack();
if (trackElement->GetRideIndex() != ride)
continue;
if (trackElement->GetTrackType() != TrackElemType::TowerSection)
continue;
return false;
}
return true;
}
@@ -3306,7 +3315,7 @@ void Vehicle::UpdateDeparting()
}
}
if (!CurrentTowerElementIsTop(ride))
if (!CurrentTowerElementIsTop())
{
if (curRide->mode == RideMode::FreefallDrop)
Invalidate();
@@ -3697,7 +3706,7 @@ void Vehicle::UpdateTravelling()
}
else
{
if (CurrentTowerElementIsTop(ride))
if (CurrentTowerElementIsTop())
{
velocity = 0;
sub_state = 2;

2
src/openrct2/ride/Vehicle.h
View File

@@ -329,7 +329,7 @@ private:
void UpdateAnimationAnimalFlying();
void UpdateAdditionalAnimation();
void CheckIfMissing();
bool CurrentTowerElementIsTop(RideId currentRideId);
bool CurrentTowerElementIsTop();
bool UpdateTrackMotionForwards(CarEntry* vehicleEntry, Ride* curRide, rct_ride_entry* rideEntry);
bool UpdateTrackMotionBackwards(CarEntry* vehicleEntry, Ride* curRide, rct_ride_entry* rideEntry);
int32_t UpdateTrackMotionPoweredRideAcceleration(CarEntry* vehicleEntry, uint32_t totalMass, const int32_t curAcceleration);