summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--map.c3
-rw-r--r--map.h12
2 files changed, 15 insertions, 0 deletions
diff --git a/map.c b/map.c
index 6cd86d260..48e16c046 100644
--- a/map.c
+++ b/map.c
@@ -2,6 +2,9 @@
#include "ttd.h"
#include "map.h"
+uint _map_log_x = TILE_X_BITS;
+uint _map_log_y = TILE_Y_BITS;
+
byte _map_type_and_height[TILES_X * TILES_Y];
byte _map5[TILES_X * TILES_Y];
byte _map3_lo[TILES_X * TILES_Y];
diff --git a/map.h b/map.h
index 8694ff277..ad21f677a 100644
--- a/map.h
+++ b/map.h
@@ -18,4 +18,16 @@ extern byte _map_owner[TILES_X * TILES_Y];
extern byte _map2[TILES_X * TILES_Y];
extern byte _map_extra_bits[TILES_X * TILES_Y / 4];
+// binary logarithm of the map size, try to avoid using this one
+static inline uint MapLogX(void) { extern uint _map_log_x; return _map_log_x; }
+static inline uint MapLogY(void) { extern uint _map_log_y; return _map_log_y; }
+/* The size of the map */
+static inline uint MapSizeX(void) { return 1 << MapLogX(); }
+static inline uint MapSizeY(void) { return 1 << MapLogY(); }
+/* The maximum coordinates */
+static inline uint MapMaxX(void) { return MapSizeX() - 1; }
+static inline uint MapMaxY(void) { return MapSizeY() - 1; }
+/* The number of tiles in the map */
+static inline uint MapSize(void) { return MapSizeX() * MapSizeY(); }
+
#endif