summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2017-03-19 21:57:54 +0000
committerpeter1138 <peter1138@openttd.org>2017-03-19 21:57:54 +0000
commit4f9fd074b8588d8ced7d04a99c6db6be2cacd1e0 (patch)
tree2cfc06e920e19251802928258fcd302002c6b9e2
parent8c49f7b98ae72524b4843925796476be18efbaea (diff)
downloadopenttd-4f9fd074b8588d8ced7d04a99c6db6be2cacd1e0.tar.xz
(svn r27805) -Codechange: Remove function ShipGetNewDirectionFromTiles
The only user of ShipGetNewDirectionFromTiles can be better served by DiagdirBetweenTiles, so remove the former. (cirdan)
-rw-r--r--src/ship_cmd.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index 2a760e2ca..5f6a77f37 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -462,14 +462,6 @@ static const Direction _new_vehicle_direction_table[] = {
DIR_E , DIR_SE, DIR_S
};
-static Direction ShipGetNewDirectionFromTiles(TileIndex new_tile, TileIndex old_tile)
-{
- uint offs = (TileY(new_tile) - TileY(old_tile) + 1) * 4 +
- TileX(new_tile) - TileX(old_tile) + 1;
- assert(offs < 11 && offs != 3 && offs != 7);
- return _new_vehicle_direction_table[offs];
-}
-
static Direction ShipGetNewDirection(Vehicle *v, int x, int y)
{
uint offs = (y - v->y_pos + 1) * 4 + (x - v->x_pos + 1);
@@ -599,9 +591,8 @@ static void ShipController(Ship *v)
/* New tile */
if (!IsValidTile(gp.new_tile)) goto reverse_direction;
- dir = ShipGetNewDirectionFromTiles(gp.new_tile, gp.old_tile);
- assert(dir == DIR_NE || dir == DIR_SE || dir == DIR_SW || dir == DIR_NW);
- DiagDirection diagdir = DirToDiagDir(dir);
+ DiagDirection diagdir = DiagdirBetweenTiles(gp.old_tile, gp.new_tile);
+ assert(diagdir != INVALID_DIAGDIR);
tracks = GetAvailShipTracks(gp.new_tile, diagdir);
if (tracks == TRACK_BIT_NONE) goto reverse_direction;