(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/clear_map.h
+++ b/src/clear_map.h
@@ -23,7 +23,7 @@ typedef enum ClearGround {
 static inline ClearGround GetClearGround(TileIndex t)
 {
 	assert(IsTileType(t, MP_CLEAR));
-	return GB(_m[t].m5, 2, 3);
+	return (ClearGround)GB(_m[t].m5, 2, 3);
 }

 static inline bool IsClearGround(TileIndex t, ClearGround ct)