summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-17 13:53:16 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-17 13:53:16 +0300
commita9b9e09cfecc1ede11647bbbc09ddc198d783947 (patch)
tree7e3e125820f7961f01e00a66a2a4a816f385b921
parentd0d0ddfeb0bd6cb199e3ac571c876d6bbaaf4b42 (diff)
downloadmanaverse-a9b9e09cfecc1ede11647bbbc09ddc198d783947.tar.gz
manaverse-a9b9e09cfecc1ede11647bbbc09ddc198d783947.tar.bz2
manaverse-a9b9e09cfecc1ede11647bbbc09ddc198d783947.tar.xz
manaverse-a9b9e09cfecc1ede11647bbbc09ddc198d783947.zip
Remove proxy methods used for access being popup.
-rw-r--r--src/gui/popupmanager.cpp7
-rw-r--r--src/gui/popupmanager.h3
-rw-r--r--src/gui/viewport.cpp5
3 files changed, 3 insertions, 12 deletions
diff --git a/src/gui/popupmanager.cpp b/src/gui/popupmanager.cpp
index 429958e5c..331b34dd9 100644
--- a/src/gui/popupmanager.cpp
+++ b/src/gui/popupmanager.cpp
@@ -82,13 +82,6 @@ void PopupManager::clearPopup()
popupMenu->clear();
}
-void PopupManager::showBeingPopup(const int x, const int y,
- Being *const b)
-{
- if (beingPopup)
- beingPopup->show(x, y, b);
-}
-
void PopupManager::showTextPopup(const int x, const int y,
const std::string &text)
{
diff --git a/src/gui/popupmanager.h b/src/gui/popupmanager.h
index ef82e1d8e..cdeebc63b 100644
--- a/src/gui/popupmanager.h
+++ b/src/gui/popupmanager.h
@@ -60,9 +60,6 @@ class PopupManager final
*/
~PopupManager();
- void showBeingPopup(const int x, const int y,
- Being *const b);
-
void showTextPopup(const int x, const int y,
const std::string &text);
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 761daf41f..9bacfeb94 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -45,6 +45,7 @@
#include "gui/fonts/font.h"
+#include "gui/popups/beingpopup.h"
#include "gui/popups/popupmenu.h"
#include "gui/windows/ministatuswindow.h"
@@ -763,8 +764,8 @@ void Viewport::mouseMoved(MouseEvent &event A_UNUSED)
|| type == ActorType::PET))
{
popupManager->hideTextPopup();
- if (mShowBeingPopup)
- popupManager->showBeingPopup(mMouseX, mMouseY, mHoverBeing);
+ if (mShowBeingPopup && beingPopup)
+ beingPopup->show(mMouseX, mMouseY, mHoverBeing);
}
else
{