diff options
| author | Michael Lutz <michi@icosahedron.de> | 2018-04-15 00:03:17 +0200 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2018-04-15 00:33:57 +0200 |
| commit | f240274b7e1d00b9cdfbfa3d91481a3b450137b4 (patch) | |
| tree | 7af331da7dc3524574666feb2b93c7673c396298 /src/water_cmd.cpp | |
| parent | 158eed669afaf0cb84ff045df5b3ecfa65ae18a3 (diff) | |
| download | openttd-f240274b7e1d00b9cdfbfa3d91481a3b450137b4.tar.xz | |
Codechange: Replace magic numbers with the proper enum.
Diffstat (limited to 'src/water_cmd.cpp')
| -rw-r--r-- | src/water_cmd.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index 6b11e7e64..07b6a9550 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -1233,7 +1233,8 @@ void ConvertGroundTilesIntoWaterTiles() static TrackStatus GetTileTrackStatus_Water(TileIndex tile, TransportType mode, uint sub_mode, DiagDirection side) { - static const byte coast_tracks[] = {0, 32, 4, 0, 16, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0}; + static const TrackBits coast_tracks[] = {TRACK_BIT_NONE, TRACK_BIT_RIGHT, TRACK_BIT_UPPER, TRACK_BIT_NONE, TRACK_BIT_LEFT, TRACK_BIT_NONE, TRACK_BIT_NONE, + TRACK_BIT_NONE, TRACK_BIT_LOWER, TRACK_BIT_NONE, TRACK_BIT_NONE, TRACK_BIT_NONE, TRACK_BIT_NONE, TRACK_BIT_NONE, TRACK_BIT_NONE, TRACK_BIT_NONE}; TrackBits ts; @@ -1241,7 +1242,7 @@ static TrackStatus GetTileTrackStatus_Water(TileIndex tile, TransportType mode, switch (GetWaterTileType(tile)) { case WATER_TILE_CLEAR: ts = IsTileFlat(tile) ? TRACK_BIT_ALL : TRACK_BIT_NONE; break; - case WATER_TILE_COAST: ts = (TrackBits)coast_tracks[GetTileSlope(tile) & 0xF]; break; + case WATER_TILE_COAST: ts = coast_tracks[GetTileSlope(tile) & 0xF]; break; case WATER_TILE_LOCK: ts = DiagDirToDiagTrackBits(GetLockDirection(tile)); break; case WATER_TILE_DEPOT: ts = AxisToTrackBits(GetShipDepotAxis(tile)); break; default: return 0; |