From e3b33b45c934dd43681a4b03692c24dd669b6520 Mon Sep 17 00:00:00 2001 From: keldorkatarn Date: Tue, 12 Sep 2017 04:53:59 +0200 Subject: [PATCH] Simplify direction lookup to also work for oil rigs. (cherry picked from commit acbff5528b6aa5a01d17b814a44b6d884ee03f69) --- src/ship_cmd.cpp | 4 +--- src/station_cmd.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index 1c3d0f5e8f..41f2fe7343 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -325,9 +325,7 @@ TileIndex Ship::GetOrderStationLocation(StationID station) } else { const Dock* dock = GetBestDock(this, st); - DiagDirection direction = GetInclinedSlopeDirection(GetTileSlope(dock->sloped)); - direction = ReverseDiagDir(direction); - + DiagDirection direction = DiagdirBetweenTiles(dock->sloped, dock->flat); return dock->flat + TileOffsByDiagDir(direction); } } else { diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 90a9b1eb22..257318bada 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2704,9 +2704,7 @@ static CommandCost RemoveDock(TileIndex tile, DoCommandFlag flags) TileIndex tile1 = removing_dock->sloped; TileIndex tile2 = removing_dock->flat; - DiagDirection direction = GetInclinedSlopeDirection(GetTileSlope(removing_dock->sloped)); - direction = ReverseDiagDir(direction); - + DiagDirection direction = DiagdirBetweenTiles(removing_dock->sloped, removing_dock->flat); TileIndex docking_location = removing_dock->flat + TileOffsByDiagDir(direction); ret = EnsureNoVehicleOnGround(tile1);