diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-05-21 21:56:41 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-05-21 21:56:41 +0200 |
| commit | 63b4c9869b6256ed7644113cd23305b07cf9df03 (patch) | |
| tree | aff0d99f5b58cbaf4195ac755ecfb79f97bf7b65 /src/resources/mapreader.cpp | |
| parent | 8c4c5a58c256cce7beb21b68c8a7d6b6ff5c4a3a (diff) | |
| parent | 2953a3f92c5097bd99ff21f4536fe167a32d90c5 (diff) | |
| download | mana-client-63b4c9869b6256ed7644113cd23305b07cf9df03.tar.gz mana-client-63b4c9869b6256ed7644113cd23305b07cf9df03.tar.bz2 mana-client-63b4c9869b6256ed7644113cd23305b07cf9df03.tar.xz mana-client-63b4c9869b6256ed7644113cd23305b07cf9df03.zip | |
Merge branch '1.0'
Conflicts:
src/beingmanager.cpp
src/beingmanager.h
src/client.cpp
src/localplayer.cpp
Diffstat (limited to 'src/resources/mapreader.cpp')
| -rw-r--r-- | src/resources/mapreader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 219eb317..e8a2bd20 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -369,7 +369,7 @@ static void setTile(Map *map, MapLayer *layer, int x, int y, int gid) else { // Set collision tile - if (set && (gid - set->getFirstGid() != 0)) + if (set && (gid - set->getFirstGid() == 1)) map->blockTile(x, y, Map::BLOCKTYPE_WALL); } } |