--- a/tile.h	Thu May 25 20:58:23 2006 +0000
+++ b/tile.h	Sat May 27 16:12:16 2006 +0000
@@ -53,7 +53,7 @@
 static inline TileType GetTileType(TileIndex tile)
 {
 	assert(tile < MapSize());
-	return GB(_m[tile].type_height, 4, 4);
+	return (TileType)GB(_m[tile].type_height, 4, 4);
 }
 
 static inline void SetTileType(TileIndex tile, TileType type)
@@ -80,7 +80,7 @@
 	assert(!IsTileType(tile, MP_VOID));
 	assert(!IsTileType(tile, MP_INDUSTRY));
 
-	return _m[tile].m1;
+	return (Owner)_m[tile].m1;
 }
 
 static inline void SetTileOwner(TileIndex tile, Owner owner)