summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-07-08 02:19:52 +0300
committerAndrei Karas <akaras@inbox.ru>2011-07-08 02:19:52 +0300
commit27c3646d10e0c5d25905d7afc7a43289159f711b (patch)
tree90257515af3615f169252161fc62b8d571076936 /src/map.cpp
parent5e14ab971129eb95ca02e373fc21adb46c0eaca1 (diff)
downloadmv-27c3646d10e0c5d25905d7afc7a43289159f711b.tar.gz
mv-27c3646d10e0c5d25905d7afc7a43289159f711b.tar.bz2
mv-27c3646d10e0c5d25905d7afc7a43289159f711b.tar.xz
mv-27c3646d10e0c5d25905d7afc7a43289159f711b.zip
Fix some issues after automatic checking.
Change compilation flags in make scripts.
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map.cpp b/src/map.cpp
index 0d98628fd..8d7002689 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -906,6 +906,9 @@ void Map::blockTile(int x, int y, BlockType type)
case BLOCKTYPE_WATER:
mMetaTiles[tileNum].blockmask |= BLOCKMASK_WATER;
break;
+ case BLOCKTYPE_GROUND:
+ mMetaTiles[tileNum].blockmask |= BLOCKMASK_GROUND;
+ break;
default:
case BLOCKTYPE_NONE:
case NB_BLOCKTYPES:
@@ -1364,7 +1367,7 @@ void Map::addExtraLayer()
return;
}
char line[201];
- std::string buf;
+
while (mapFile.getline(line, 200))
{
std::string buf;