diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-19 18:29:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-19 18:29:03 +0300 |
| commit | 7b6b389fe156b8ff1fc1f35ee776a2e65f160921 (patch) | |
| tree | 81e893b9e57ff483492df3dd4b645157a02173b3 /src/resources/mapreader.cpp | |
| parent | f3fdd048e6265ab2c6e88ddff21dffd9409c03db (diff) | |
| download | plus-7b6b389fe156b8ff1fc1f35ee776a2e65f160921.tar.gz plus-7b6b389fe156b8ff1fc1f35ee776a2e65f160921.tar.bz2 plus-7b6b389fe156b8ff1fc1f35ee776a2e65f160921.tar.xz plus-7b6b389fe156b8ff1fc1f35ee776a2e65f160921.zip | |
Move mapitemtype into separate file.
Diffstat (limited to 'src/resources/mapreader.cpp')
| -rw-r--r-- | src/resources/mapreader.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 6a15555d9..cc8b14a30 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -36,6 +36,7 @@ #include "resources/animation.h" #include "resources/beingcommon.h" #include "resources/image.h" +#include "resources/mapitemtype.h" #include "resources/resourcemanager.h" #include "resources/db/mapdb.h" @@ -422,17 +423,17 @@ Map *MapReader::readMap(XmlNodePtrConst node, const std::string &path) map->addParticleEffect(warpPath, objX, objY, objW, objH); } - map->addPortal(objName, MapItem::PORTAL, + map->addPortal(objName, MapItemType::PORTAL, objX, objY, objW, objH); } else if (objType == "SPAWN") { -// map->addPortal(_("Spawn: ") + objName, MapItem::PORTAL, +// map->addPortal(_("Spawn: ") + objName, MapItemType::PORTAL, // objX, objY, objW, objH); } else if (objType == "MUSIC") { - map->addRange(objName, MapItem::MUSIC, + map->addRange(objName, MapItemType::MUSIC, objX, objY, objW, objH); } else |