diff --git a/map.h b/map.h
index 5e5b395e15..8adc0f075a 100644
--- a/map.h
+++ b/map.h
@@ -3,7 +3,7 @@
 
 #include "stdafx.h"
 
-#define TILE_FROM_XY(x,y) (int)((((y) >> 4) << MapLogX()) + ((x) >> 4))
+#define TILE_FROM_XY(x,y) (TileIndex)((((y) >> 4) << MapLogX()) + ((x) >> 4))
 #define TILE_XY(x,y) (((y) << MapLogX()) + (x))
 
 #define TILE_MASK(x) ((x) & ((1 << (MapLogX() + MapLogY())) - 1))