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/gui/popups | |
parent | f3fdd048e6265ab2c6e88ddff21dffd9409c03db (diff) | |
download | manaplus-7b6b389fe156b8ff1fc1f35ee776a2e65f160921.tar.gz manaplus-7b6b389fe156b8ff1fc1f35ee776a2e65f160921.tar.bz2 manaplus-7b6b389fe156b8ff1fc1f35ee776a2e65f160921.tar.xz manaplus-7b6b389fe156b8ff1fc1f35ee776a2e65f160921.zip |
Move mapitemtype into separate file.
Diffstat (limited to 'src/gui/popups')
-rw-r--r-- | src/gui/popups/popupmenu.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 7e9925039..00cae3ee3 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -76,6 +76,7 @@ #include "net/tradehandler.h" #include "resources/iteminfo.h" +#include "resources/mapitemtype.h" #include "resources/skillconsts.h" #include "resources/map/map.h" @@ -1356,11 +1357,11 @@ void PopupMenu::handleLink(const std::string &link, if (specialLayer) { const bool isHome = (mMapItem->getType() - == static_cast<int>(MapItem::HOME)); + == static_cast<int>(MapItemType::HOME)); const int x = static_cast<const int>(mMapItem->getX()); const int y = static_cast<const int>(mMapItem->getY()); specialLayer->setTile(x, y, - static_cast<int>(MapItem::EMPTY)); + static_cast<int>(MapItemType::EMPTY)); if (socialWindow) socialWindow->removePortal(x, y); if (isHome && player_node) @@ -2284,7 +2285,7 @@ void PopupMenu::showAttackMonsterPopup(const int x, const int y, } switch (type) { - case MapItem::ATTACK: + case MapItemType::ATTACK: { const int idx = actorManager->getAttackMobIndex(name); const int size = actorManager->getAttackMobsSize(); @@ -2302,7 +2303,7 @@ void PopupMenu::showAttackMonsterPopup(const int x, const int y, } break; } - case MapItem::PRIORITY: + case MapItemType::PRIORITY: { const int idx = actorManager-> getPriorityAttackMobIndex(name); @@ -2321,7 +2322,7 @@ void PopupMenu::showAttackMonsterPopup(const int x, const int y, } break; } - case MapItem::IGNORE_: + case MapItemType::IGNORE_: break; default: break; |