summaryrefslogtreecommitdiff
path: root/map.h
diff options
context:
space:
mode:
authormatthijs <matthijs@openttd.org>2005-06-16 18:04:02 +0000
committermatthijs <matthijs@openttd.org>2005-06-16 18:04:02 +0000
commit9cb58e0bb3799224f48a6c9e278b288551c59bec (patch)
tree13bfcb2e646ad2b6e44031f7353f93fe0551bc96 /map.h
parentfc5784a3103d5e4fc0dbfec5f905a6ebbfd9c84b (diff)
downloadopenttd-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 'map.h')
-rw-r--r--map.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/map.h b/map.h
index 3bf619b24..348e22bc4 100644
--- a/map.h
+++ b/map.h
@@ -48,6 +48,13 @@ enum {
INVALID_TILE = (uint32) -1
};
+enum {
+ TILE_SIZE = 16, /* Tiles are 16x16 "units" in size */
+ TILE_PIXELS = 32, /* a tile is 32x32 pixels */
+ TILE_HEIGHT = 8, /* The standard height-difference between tiles on two levels is 8 (z-diff 8) */
+};
+
+
static inline uint TileX(TileIndex tile)
{
return tile & MapMaxX();