summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-17 13:59:36 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-17 13:59:36 +0300
commitde1c28279bebbbd266e5c3020a38274e20cebb5c (patch)
treeecbb37280e9295380b994bea25544d381c16975f /src/gui
parent819b10633d3218ac4b758e62051d0c1376d91205 (diff)
downloadManaVerse-de1c28279bebbbd266e5c3020a38274e20cebb5c.tar.gz
ManaVerse-de1c28279bebbbd266e5c3020a38274e20cebb5c.tar.bz2
ManaVerse-de1c28279bebbbd266e5c3020a38274e20cebb5c.tar.xz
ManaVerse-de1c28279bebbbd266e5c3020a38274e20cebb5c.zip
Add eathena defines into actortype enum.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/popupmenu.cpp3
-rw-r--r--src/gui/viewport.cpp8
-rw-r--r--src/gui/windows/minimap.cpp6
3 files changed, 12 insertions, 5 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 5ef07eb69..a458cf17d 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -307,6 +307,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
break;
}
+#ifdef EATHENA_SUPPORT
case ActorType::Mercenary:
// TRANSLATORS: popup menu item
// TRANSLATORS: Mercenary move to master
@@ -355,7 +356,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
mBrowserBox->addRow("##3---");
}
break;
-
+#endif
case ActorType::Avatar:
case ActorType::Unknown:
case ActorType::FloorItem:
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 2871bcb65..fd9166c33 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -777,10 +777,12 @@ void Viewport::mouseMoved(MouseEvent &event)
if (mHoverBeing
&& (type == ActorType::Player
|| type == ActorType::Npc
+#ifdef EATHENA_SUPPORT
|| type == ActorType::Homunculus
|| type == ActorType::Mercenary
- || type == ActorType::LocalPet
- || type == ActorType::Pet))
+ || type == ActorType::Pet
+#endif
+ || type == ActorType::LocalPet))
{
popupManager->hideTextPopup();
if (mShowBeingPopup && beingPopup)
@@ -837,9 +839,11 @@ void Viewport::mouseMoved(MouseEvent &event)
case ActorType::Monster:
case ActorType::Portal:
case ActorType::LocalPet:
+#ifdef EATHENA_SUPPORT
case ActorType::Pet:
case ActorType::Mercenary:
case ActorType::Homunculus:
+#endif
gui->setCursorType(mHoverBeing->getHoverCursor());
break;
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 8fcb175ef..64c69b1e1 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -332,10 +332,12 @@ void Minimap::draw(Graphics *graphics)
break;
case ActorType::LocalPet:
+#ifdef EATHENA_SUPPORT
case ActorType::Pet:
+#endif
type = UserPalette::PET;
break;
-
+#ifdef EATHENA_SUPPORT
case ActorType::Mercenary:
type = UserPalette::MERCENARY;
break;
@@ -343,7 +345,7 @@ void Minimap::draw(Graphics *graphics)
case ActorType::Homunculus:
type = UserPalette::HOMUNCULUS;
break;
-
+#endif
case ActorType::Avatar:
case ActorType::Unknown:
case ActorType::Player: