summaryrefslogtreecommitdiff
path: root/src/gui/viewport.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-28 16:03:59 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-28 16:34:59 +0300
commitb96e6eeba6e1511568c8291bd8cb6a6d3706635c (patch)
treed021843c88d856f86f018547c30f1181290ffcbe /src/gui/viewport.cpp
parent60859a71dd9794b0216cc7a60146d417e06dbbad (diff)
downloadmv-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.gz
mv-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.bz2
mv-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.xz
mv-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.zip
Remove define EATHENA_SUPPORT from all code.
Now eathena like support enabled always.
Diffstat (limited to 'src/gui/viewport.cpp')
-rw-r--r--src/gui/viewport.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 90a32165a..a543f53bd 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -446,12 +446,8 @@ bool Viewport::leftMouseAction()
}
else if (!stopAttack &&
(type == ActorType::Monster ||
- type == ActorType::Npc
-#ifdef EATHENA_SUPPORT
- ||
- type == ActorType::SkillUnit
-#endif
- ))
+ type == ActorType::Npc ||
+ type == ActorType::SkillUnit))
{
if ((localPlayer->withinAttackRange(mHoverBeing) ||
inputManager.isActionActive(InputAction::ATTACK)))
@@ -837,11 +833,9 @@ void Viewport::mouseMoved(MouseEvent &event)
if (mHoverBeing
&& (type == ActorType::Player
|| type == ActorType::Npc
-#ifdef EATHENA_SUPPORT
|| type == ActorType::Homunculus
|| type == ActorType::Mercenary
|| type == ActorType::Pet
-#endif
|| type == ActorType::LocalPet))
{
popupManager->hideTextPopup();
@@ -899,12 +893,10 @@ 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:
case ActorType::SkillUnit:
-#endif
gui->setCursorType(mHoverBeing->getHoverCursor());
break;