summaryrefslogtreecommitdiff
path: root/map.h
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-01-07 17:40:23 +0000
committertron <tron@openttd.org>2005-01-07 17:40:23 +0000
commit35972e68e144030fa04198ba7f47ccc21ae5dfa4 (patch)
treeb4a2b5890976917c6f844cc28c48a6c17d7aa234 /map.h
parent7ca6b2b8b0d6f66966fa2ff01e3e9961314dfcc4 (diff)
downloadopenttd-35972e68e144030fa04198ba7f47ccc21ae5dfa4.tar.xz
(svn r1415) Move TILE_FROM_XY and TILE_XY to map.h and push TILE_[XY] bits from map.h into map.c.
Now the whole source except map.c is independent of TILE_[XY]_BITS!
Diffstat (limited to 'map.h')
-rw-r--r--map.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/map.h b/map.h
index f7bb61b70..289d80a13 100644
--- a/map.h
+++ b/map.h
@@ -1,8 +1,8 @@
#ifndef MAP_H
#define MAP_H
-#define TILE_X_BITS 8
-#define TILE_Y_BITS 8
+#define TILE_FROM_XY(x,y) (int)((((y) >> 4) << MapLogX()) + ((x) >> 4))
+#define TILE_XY(x,y) (int)(((y) << MapLogX()) + (x))
#define TILE_MASK(x) (int)((x) & ((1 << (MapLogX() + MapLogY())) - 1))