summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-01 20:50:07 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-01 20:50:07 +0300
commit91fbc3ca1d60b684554813004dbca311909d038d (patch)
tree41b45cdbd86a904bd910186cd57afac5181f2594
parentc9a0a01ffff11b23c517cc2d0c6a08a83c7a8158 (diff)
downloadmanaplus-91fbc3ca1d60b684554813004dbca311909d038d.tar.gz
manaplus-91fbc3ca1d60b684554813004dbca311909d038d.tar.bz2
manaplus-91fbc3ca1d60b684554813004dbca311909d038d.tar.xz
manaplus-91fbc3ca1d60b684554813004dbca311909d038d.zip
Add basic support for gm menus for pets, homunculuses, mercenaries.
-rw-r--r--src/gui/popups/popupmenu.cpp31
-rw-r--r--src/gui/popups/popupmenu.h6
2 files changed, 31 insertions, 6 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 101072d58..37c7ee2a0 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -3055,6 +3055,19 @@ void PopupMenu::showGMPopup(const std::string &name)
case ActorType::FloorItem:
showFloorItemGMCommands();
break;
+#ifdef EATHENA_SUPPORT
+ case ActorType::Homunculus:
+ showHomunGMCommands();
+ break;
+ case ActorType::Pet:
+ showPetGMCommands();
+ break;
+ case ActorType::Mercenary:
+ showMercenaryGMCommands();
+ break;
+ case ActorType::SkillUnit:
+ break;
+#endif
default:
case ActorType::Unknown:
if (mItemId != 0)
@@ -3063,12 +3076,6 @@ void PopupMenu::showGMPopup(const std::string &name)
case ActorType::Portal:
case ActorType::LocalPet:
case ActorType::Avatar:
-#ifdef EATHENA_SUPPORT
- case ActorType::Pet:
- case ActorType::Mercenary:
- case ActorType::Homunculus:
- case ActorType::SkillUnit:
-#endif
break;
}
}
@@ -3082,6 +3089,18 @@ void PopupMenu::showGMPopup(const std::string &name)
}
#ifdef EATHENA_SUPPORT
+void PopupMenu::showHomunGMCommands()
+{
+}
+
+void PopupMenu::showPetGMCommands()
+{
+}
+
+void PopupMenu::showMercenaryGMCommands()
+{
+}
+
void PopupMenu::showCraftPopup()
{
mBrowserBox->clearRows();
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index 58ae77a88..ad4c943b8 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -220,6 +220,12 @@ class PopupMenu final : public Popup, public LinkHandler
void addWindowMenu(const Window *const window);
#ifdef EATHENA_SUPPORT
+ void showHomunGMCommands();
+
+ void showPetGMCommands();
+
+ void showMercenaryGMCommands();
+
void addChat(const Being *const being);
#endif