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

Integrate loc_6DB967

This commit is contained in:
Gymnasiast 2021-01-17 19:40:08 +01:00
parent c200d7ab9c
commit 7e50d1bbc5
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
1 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8354,24 +8354,6 @@ loc_6DAEB9:
otherVehicleIndex = prev_vehicle_on_ride;
if (UpdateMotionCollisionDetection(loc, &otherVehicleIndex))
{
goto loc_6DB967;
}
}
}
}
// loc_6DB928
if (remaining_distance < 0x368A)
{
return true;
}
regs.ebx = dword_9A2970[regs.ebx];
acceleration += regs.ebx;
_vehicleUnkF64E10++;
goto loc_6DAEB9;
loc_6DB967:
_vehicleVelocityF64E0C -= remaining_distance + 1;
remaining_distance = -1;
@ -8410,6 +8392,21 @@ loc_6DB967:
_vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_1;
return false;
}
}
}
}
// loc_6DB928
if (remaining_distance < 0x368A)
{
return true;
}
regs.ebx = dword_9A2970[regs.ebx];
acceleration += regs.ebx;
_vehicleUnkF64E10++;
goto loc_6DAEB9;
}
static PitchAndRoll PitchAndRollEnd(Ride* curRide, bool useInvertedSprites, uint16_t trackType, TileElement* tileElement)
{