(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.

2007-01-10 18:56:51 +00:00
parent ce75f6549d
commit a7d0cdf95f
190 changed files with 2825 additions and 2208 deletions
--- a/src/map.h
+++ b/src/map.h
@@ -67,13 +67,6 @@ static inline TileIndex TileVirtXY(uint x, uint y)
 	return (y >> 4 << MapLogX()) + (x >> 4);
 }

-typedef byte Owner;
-enum Owners {
-	OWNER_TOWN      = 0x0F, // a town owns the tile
-	OWNER_NONE      = 0x10, // nobody owns the tile
-	OWNER_WATER     = 0x11, // "water" owns the tile
-	OWNER_END       = 0x12,
-};

 enum {
 	INVALID_TILE = (TileIndex)-1