dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify direction lookup to also work for oil rigs.

Browse Source 
(cherry picked from commit acbff5528b6aa5a01d17b814a44b6d884ee03f69)
This commit is contained in:
keldorkatarn
2017-09-12 04:53:59 +02:00
committed by Jonathan G Rennison
parent 1d3cf59d8a
commit e3b33b45c9
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ship_cmd.cpp
View File

@@ -325,9 +325,7 @@ TileIndex Ship::GetOrderStationLocation(StationID station)
} else { } else {
const Dock* dock = GetBestDock(this, st); const Dock* dock = GetBestDock(this, st);
DiagDirection direction = GetInclinedSlopeDirection(GetTileSlope(dock->sloped)); DiagDirection direction = DiagdirBetweenTiles(dock->sloped, dock->flat);
direction = ReverseDiagDir(direction);
return dock->flat + TileOffsByDiagDir(direction); return dock->flat + TileOffsByDiagDir(direction);
} }
} else { } else {

4
src/station_cmd.cpp
View File

@@ -2704,9 +2704,7 @@ static CommandCost RemoveDock(TileIndex tile, DoCommandFlag flags)
TileIndex tile1 = removing_dock->sloped; TileIndex tile1 = removing_dock->sloped;
TileIndex tile2 = removing_dock->flat; TileIndex tile2 = removing_dock->flat;
DiagDirection direction = GetInclinedSlopeDirection(GetTileSlope(removing_dock->sloped)); DiagDirection direction = DiagdirBetweenTiles(removing_dock->sloped, removing_dock->flat);
direction = ReverseDiagDir(direction);
TileIndex docking_location = removing_dock->flat + TileOffsByDiagDir(direction); TileIndex docking_location = removing_dock->flat + TileOffsByDiagDir(direction);
ret = EnsureNoVehicleOnGround(tile1); ret = EnsureNoVehicleOnGround(tile1);