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

Part of #9473: vehicle_current_tower_element_is_top to Vehicle::CurrentTowerElementIsTop

Browse Source
This commit is contained in:
hdpoliveira
2020-04-10 05:32:47 -03:00
parent 49b37aafe8
commit bbdd70395f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3084,9 +3084,9 @@ void vehicle_test_reset(Vehicle* vehicle)
window_invalidate_by_number(WC_RIDE, vehicle->ride);
}
static bool vehicle_current_tower_element_is_top(Vehicle* vehicle)
bool Vehicle::CurrentTowerElementIsTop()
{
TileElement* tileElement = map_get_track_element_at_of_type(vehicle->TrackLocation, vehicle->track_type >> 2);
TileElement* tileElement = map_get_track_element_at_of_type(TrackLocation, track_type >> 2);
if (tileElement != nullptr)
{
while (!tileElement->IsLastForTile())
@@ -3367,7 +3367,7 @@ void Vehicle::UpdateDeparting()
}
}
if (!vehicle_current_tower_element_is_top(this))
if (!CurrentTowerElementIsTop())
{
if (curRide->mode == RIDE_MODE_FREEFALL_DROP)
Invalidate();
@@ -3733,7 +3733,7 @@ void Vehicle::UpdateTravelling()
}
else
{
if (vehicle_current_tower_element_is_top(this))
if (CurrentTowerElementIsTop())
{
velocity = 0;
sub_state = 2;

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

@@ -343,6 +343,7 @@ private:
int32_t UpdateMotionDodgems();
void UpdateAdditionalAnimation();
void CheckIfMissing();
bool CurrentTowerElementIsTop();
};
struct train_ref