diff options
| author | truelight <truelight@openttd.org> | 2004-09-05 16:15:22 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2004-09-05 16:15:22 +0000 |
| commit | 10d54ac604b2d4d761877de1ceda07ceb3aa96bf (patch) | |
| tree | ee4a252395acdf618350f3ff31b92a1b493f12ef /ship_cmd.c | |
| parent | 1846563cf89fc4cdd41691ddadac6b56dd8c2e58 (diff) | |
| download | openttd-10d54ac604b2d4d761877de1ceda07ceb3aa96bf.tar.xz | |
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
-Fix: some minor fixes around GetTileTrackStatus (blathijs)
Diffstat (limited to 'ship_cmd.c')
| -rw-r--r-- | ship_cmd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ship_cmd.c b/ship_cmd.c index 009f2f18b..de853968e 100644 --- a/ship_cmd.c +++ b/ship_cmd.c @@ -15,7 +15,7 @@ static const uint16 _ship_sprites[] = {0x0E5D, 0x0E55, 0x0E65, 0x0E6D}; static const byte _ship_sometracks[4] = {0x19, 0x16, 0x25, 0x2A}; static byte GetTileShipTrackStatus(uint tile) { - uint32 r = GetTileTrackStatus(tile, 4); + uint32 r = GetTileTrackStatus(tile, TRANSPORT_WATER); return r | r >> 8; } @@ -492,7 +492,7 @@ static uint FindShipTrack(Vehicle *v, uint tile, int dir, uint bits, uint skipti pfs.best_bird_dist = (uint)-1; pfs.best_length = (uint)-1; - FollowTrack(tile, 0x3804, _ship_search_directions[i][dir], (TPFEnumProc*)ShipTrackFollower, NULL, &pfs); + FollowTrack(tile, 0x3800 | TRANSPORT_WATER, _ship_search_directions[i][dir], (TPFEnumProc*)ShipTrackFollower, NULL, &pfs); if (best_track >= 0) { if (pfs.best_bird_dist != 0) { @@ -569,7 +569,7 @@ static int ShipGetNewDirection(Vehicle *v, int x, int y) static int GetAvailShipTracks(uint tile, int dir) { - uint32 r = GetTileTrackStatus(tile, 4); + uint32 r = GetTileTrackStatus(tile, TRANSPORT_WATER); return (byte) ((r | r >> 8)) & _ship_sometracks[dir]; } |