diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-11 16:44:15 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-11 16:44:15 +0300 |
| commit | 77bb74bd2d944be1a1dc719027dbf37ad088b828 (patch) | |
| tree | 0feb040a768eff20220835eb359e767dc43f113c /src/resources/mapreader.cpp | |
| parent | 835dd846af75ea2cfc91f0134156f9c6545dd8ce (diff) | |
| download | ManaVerse-77bb74bd2d944be1a1dc719027dbf37ad088b828.tar.gz ManaVerse-77bb74bd2d944be1a1dc719027dbf37ad088b828.tar.bz2 ManaVerse-77bb74bd2d944be1a1dc719027dbf37ad088b828.tar.xz ManaVerse-77bb74bd2d944be1a1dc719027dbf37ad088b828.zip | |
Move blocktype into separate file.
Diffstat (limited to 'src/resources/mapreader.cpp')
| -rw-r--r-- | src/resources/mapreader.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index ebdca49ac..54f80fe79 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -27,6 +27,7 @@ #include "logger.h" #include "main.h" +#include "resources/map/blocktype.h" #include "resources/map/map.h" #include "resources/map/mapconsts.h" #include "resources/map/tileset.h" @@ -496,19 +497,19 @@ inline static void setTile(Map *const map, MapLayer *const layer, switch (gid - set->getFirstGid()) { case Map::COLLISION_EMPTY: - map->blockTile(x, y, Map::BLOCKTYPE_GROUND); + map->blockTile(x, y, BlockType::GROUND); break; case Map::COLLISION_WALL: - map->blockTile(x, y, Map::BLOCKTYPE_WALL); + map->blockTile(x, y, BlockType::WALL); break; case Map::COLLISION_AIR: - map->blockTile(x, y, Map::BLOCKTYPE_AIR); + map->blockTile(x, y, BlockType::AIR); break; case Map::COLLISION_WATER: - map->blockTile(x, y, Map::BLOCKTYPE_WATER); + map->blockTile(x, y, BlockType::WATER); break; case Map::COLLISION_GROUNDTOP: - map->blockTile(x, y, Map::BLOCKTYPE_GROUNDTOP); + map->blockTile(x, y, BlockType::GROUNDTOP); break; default: break; @@ -517,7 +518,7 @@ inline static void setTile(Map *const map, MapLayer *const layer, else { if (gid - set->getFirstGid() != 0) - map->blockTile(x, y, Map::BLOCKTYPE_WALL); + map->blockTile(x, y, BlockType::WALL); } } break; |