From 129f749d057e3b96161630934da7b2d89dec3c71 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 18 Apr 2015 00:00:46 +0300 Subject: Add eathena defines into being. --- src/gui/popups/beingpopup.cpp | 4 ++++ src/gui/popups/popupmenu.cpp | 8 +++++++- src/gui/popups/popupmenu.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src/gui') diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp index f0a8868f4..0592189aa 100644 --- a/src/gui/popups/beingpopup.cpp +++ b/src/gui/popups/beingpopup.cpp @@ -251,6 +251,7 @@ void BeingPopup::show(const int x, const int y, Being *const b) label3 = nullptr; } +#ifdef EATHENA_SUPPORT if (!b->getBuyBoard().empty()) { // TRANSLATORS: being popup label @@ -259,6 +260,7 @@ void BeingPopup::show(const int x, const int y, Being *const b) label4->adjustSize(); } else +#endif { label7 = label6; label6 = label5; @@ -266,6 +268,7 @@ void BeingPopup::show(const int x, const int y, Being *const b) label4 = nullptr; } +#ifdef EATHENA_SUPPORT if (!b->getSellBoard().empty()) { // TRANSLATORS: being popup label @@ -274,6 +277,7 @@ void BeingPopup::show(const int x, const int y, Being *const b) label5->adjustSize(); } else +#endif { label7 = label6; label6 = label5; diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index b16dd2ff4..b81ab29dd 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -234,7 +234,9 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) mBrowserBox->addRow("/navigateto 'NAME'", _("Move")); addPlayerMisc(); addBuySell(being); +#ifdef EATHENA_SUPPORT addChat(being); +#endif break; } @@ -266,7 +268,9 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) // TRANSLATORS: popup menu item // TRANSLATORS: add comment to npc mBrowserBox->addRow("addcomment", _("Add comment")); +#ifdef EATHENA_SUPPORT addChat(being); +#endif break; case ActorType::Monster: @@ -1407,13 +1411,13 @@ void PopupMenu::handleLink(const std::string &link, if (Widget::widgetExists(mWindow)) mWindow->setSticky(true); } +#ifdef EATHENA_SUPPORT else if (link == "join chat" && being) { const ChatObject *const chat = being->getChat(); if (chat) chatHandler->joinChat(chat, ""); } -#ifdef EATHENA_SUPPORT else if (link == "fire mercenary") { mercenaryHandler->fire(); @@ -2443,6 +2447,7 @@ void PopupMenu::addParty(const std::string &nick) } } +#ifdef EATHENA_SUPPORT void PopupMenu::addChat(const Being *const being) { if (!being) @@ -2457,6 +2462,7 @@ void PopupMenu::addChat(const Being *const being) mBrowserBox->addRow("##3---"); } } +#endif void PopupMenu::addPlayerMisc() { diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h index d523307bf..5d6420662 100644 --- a/src/gui/popups/popupmenu.h +++ b/src/gui/popups/popupmenu.h @@ -187,7 +187,9 @@ class PopupMenu final : public Popup, public LinkHandler void addWindowMenu(Window *const window); +#ifdef EATHENA_SUPPORT void addChat(const Being *const being); +#endif void showGMPopup(); -- cgit v1.2.3-70-g09d2