diff options
author | matthijs <matthijs@openttd.org> | 2005-06-16 18:04:02 +0000 |
---|---|---|
committer | matthijs <matthijs@openttd.org> | 2005-06-16 18:04:02 +0000 |
commit | 9cb58e0bb3799224f48a6c9e278b288551c59bec (patch) | |
tree | 13bfcb2e646ad2b6e44031f7353f93fe0551bc96 /depot.h | |
parent | fc5784a3103d5e4fc0dbfec5f905a6ebbfd9c84b (diff) | |
download | openttd-9cb58e0bb3799224f48a6c9e278b288551c59bec.tar.xz |
(svn r2448) General cleanup of rail related code, more to follow.
* Add: rail.[ch] for rail-related enums and wrapper functions.
* Codechange: Removed dozens of magic numbers with below enums.
* Codechange: Rewrote CheckTrackCombination().
* Add: TILE_SIZE, TILE_PIXELS and TILE_HEIGHT constants.
* Add: enums RailTileType, RailTileSubtype, SignalType to mask against the map arrays.
* Add: enums Track, TrackBits, Trackdir, TrackdirBits for railway track data. (Note that the old RAIL_BIT constants are replaced by TRACK_BIT ones).
* Add: enums Direction and DiagDirection
* Codechange: Moved a bunch of track(dir) related lookup arrays from npf.[ch] to rail.[ch].
* Codechange: move RailType enum from tile.h to rail.h.
* Add: Wrapper functions for masking signal status in the map arrays: SignalAlongTrackdir, SignalAgainstTrackdir and SignalOnTrack.
* Add: Wrapper functions to access rail tiles, using above enums
* Add: Wrapper functions to modify tracks, trackdirs, directions, etc.
* Add: Wrapper functions for all lookup arrays in rail.[ch] (Arrays are still used in parts of the code)
* Codechange: Renamed some variables and arguments to better represent what they contain (railbit -> track, bits -> trackdirbits, etc.).
* Codechange: Don't use FindLandscapeHeight() in CmdRemoveSingleRail(), since it returns way too much info. Use GetTileSlope() instead.
* Codechange: [NPF] Removed some unused globals and code from npf.c.
Diffstat (limited to 'depot.h')
-rw-r--r-- | depot.h | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -89,7 +89,7 @@ static inline bool IsTileDepotType(TileIndex tile, TransportType type) /** * Returns the direction the exit of the depot on the given tile is facing. */ -static inline uint GetDepotDirection(TileIndex tile, TransportType type) +static inline DiagDirection GetDepotDirection(TileIndex tile, TransportType type) { assert(IsTileDepotType(tile, type)); @@ -102,13 +102,13 @@ static inline uint GetDepotDirection(TileIndex tile, TransportType type) case TRANSPORT_WATER: /* Water is stubborn, it stores the directions in a different order. */ switch (_map5[tile] & 3) { - case 0: return 0; - case 1: return 2; - case 2: return 3; - case 3: return 1; + case 0: return DIAGDIR_NE; + case 1: return DIAGDIR_SW; + case 2: return DIAGDIR_NW; + case 3: return DIAGDIR_SE; } default: - return 0; /* Not reached */ + return INVALID_DIAGDIR; /* Not reached */ } } |