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

2007-01-10 18:56:51 +00:00
parent a332d10fd9
commit f35ed4bbc2
190 changed files with 2825 additions and 2208 deletions
--- a/src/unmovable_map.h
+++ b/src/unmovable_map.h
@@ -26,7 +26,7 @@ typedef enum UnmovableType {
 static inline UnmovableType GetUnmovableType(TileIndex t)
 {
 	assert(IsTileType(t, MP_UNMOVABLE));
-	return _m[t].m5;
+	return (UnmovableType)_m[t].m5;
 }