diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-29 20:33:10 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-29 20:33:10 +0300 |
commit | 9f1994182d4225f630a93ae06b01927c4f7a9a37 (patch) | |
tree | b3557f6c6e6a923170929fd6553b59f872634291 /src/gui/popups | |
parent | aef032f93b7bdc6e5908b2fa5f940a43bcfce50e (diff) | |
download | manaverse-9f1994182d4225f630a93ae06b01927c4f7a9a37.tar.gz manaverse-9f1994182d4225f630a93ae06b01927c4f7a9a37.tar.bz2 manaverse-9f1994182d4225f630a93ae06b01927c4f7a9a37.tar.xz manaverse-9f1994182d4225f630a93ae06b01927c4f7a9a37.zip |
Convert ActorType enum into strong typed enum.
Diffstat (limited to 'src/gui/popups')
-rw-r--r-- | src/gui/popups/beingpopup.cpp | 2 | ||||
-rw-r--r-- | src/gui/popups/popupmenu.cpp | 2 | ||||
-rw-r--r-- | src/gui/popups/popupmenu.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp index 167767e74..8cacafefb 100644 --- a/src/gui/popups/beingpopup.cpp +++ b/src/gui/popups/beingpopup.cpp @@ -157,7 +157,7 @@ void BeingPopup::show(const int x, const int y, Being *const b) label7->setCaption(""); #ifdef EATHENA_SUPPORT - const ActorType::Type type = b->getType(); + const ActorTypeT type = b->getType(); if (type == ActorType::Pet) { PetInfo *const info = PlayerInfo::getPet(); diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 59c1cc469..6c348a8e5 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -1070,7 +1070,7 @@ void PopupMenu::handleLink(const std::string &link, else { dialog->setText(Being::loadComment(mNick, - static_cast<ActorType::Type>(mType))); + static_cast<ActorTypeT>(mType))); } dialog->setActionEventId("ok"); dialog->addActionListener(&mPlayerListener); diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h index e1f9b3ba7..d963591bc 100644 --- a/src/gui/popups/popupmenu.h +++ b/src/gui/popups/popupmenu.h @@ -216,7 +216,7 @@ class PopupMenu final : public Popup, public LinkHandler Button *mButton; std::string mNick; TextField *mTextField; - ActorType::Type mType; + ActorTypeT mType; int mX; int mY; |