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

Limit amount of path being reserved at single crossing

This commit is contained in:
Jeroen D Stout 2018-01-11 02:09:10 +01:00 committed by Ted John
parent 547973066c
commit 299d2e82ab
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9943,7 +9943,7 @@ void vehicle_update_crossings(rct_vehicle * vehicle)
if (xyElement.element && vehicle->status != VEHICLE_STATUS_ARRIVING) if (xyElement.element && vehicle->status != VEHICLE_STATUS_ARRIVING)
{ {
sint16 autoReserveAhead = 4 + abs(vehicle->velocity) / 150000; sint16 autoReserveAhead = 4 + abs(vehicle->velocity) / 150000;
bool keepReserving; sint16 crossingBonus = 0;
// vehicle positions mean we have to take larger // vehicle positions mean we have to take larger
// margins for travelling backwards // margins for travelling backwards
@ -9954,8 +9954,6 @@ void vehicle_update_crossings(rct_vehicle * vehicle)
while (true) while (true)
{ {
keepReserving = false;
rct_tile_element *tileElement = map_get_path_element_at( rct_tile_element *tileElement = map_get_path_element_at(
xyElement.x / 32, xyElement.x / 32,
xyElement.y / 32, xyElement.y / 32,
@ -9964,11 +9962,15 @@ void vehicle_update_crossings(rct_vehicle * vehicle)
if (tileElement) if (tileElement)
{ {
crossingBonus = 4;
tileElement->flags |= TILE_ELEMENT_FLAG_BLOCKED_BY_VEHICLE; tileElement->flags |= TILE_ELEMENT_FLAG_BLOCKED_BY_VEHICLE;
keepReserving = true; }
else
{
crossingBonus = 0;
} }
if (--autoReserveAhead <= 0 && !keepReserving) if (--autoReserveAhead + crossingBonus <= 0)
{ {
break; break;
} }