mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r27805) -Codechange: Remove function ShipGetNewDirectionFromTiles 

The only user of ShipGetNewDirectionFromTiles can be better
served by DiagdirBetweenTiles, so remove the former. (cirdan)
release/1.8
peter1138 2017-03-19 21:57:54 +00:00
parent 8c49f7b98a
commit 4f9fd074b8
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ship_cmd.cpp
View File

@ -462,14 +462,6 @@ static const Direction _new_vehicle_direction_table[] = {
DIR_E , DIR_SE, DIR_S 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) static Direction ShipGetNewDirection(Vehicle *v, int x, int y)
{ {
uint offs = (y - v->y_pos + 1) * 4 + (x - v->x_pos + 1); uint offs = (y - v->y_pos + 1) * 4 + (x - v->x_pos + 1);
@ -599,9 +591,8 @@ static void ShipController(Ship *v)
/* New tile */ /* New tile */
if (!IsValidTile(gp.new_tile)) goto reverse_direction; if (!IsValidTile(gp.new_tile)) goto reverse_direction;
dir = ShipGetNewDirectionFromTiles(gp.new_tile, gp.old_tile); DiagDirection diagdir = DiagdirBetweenTiles(gp.old_tile, gp.new_tile);
assert(dir == DIR_NE || dir == DIR_SE || dir == DIR_SW || dir == DIR_NW); assert(diagdir != INVALID_DIAGDIR);
DiagDirection diagdir = DirToDiagDir(dir);
tracks = GetAvailShipTracks(gp.new_tile, diagdir); tracks = GetAvailShipTracks(gp.new_tile, diagdir);
if (tracks == TRACK_BIT_NONE) goto reverse_direction; if (tracks == TRACK_BIT_NONE) goto reverse_direction;