summaryrefslogtreecommitdiff
path: root/src/actormanager.cpp
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/actormanager.cpp
parent819b10633d3218ac4b758e62051d0c1376d91205 (diff)
downloadmv-de1c28279bebbbd266e5c3020a38274e20cebb5c.tar.gz
mv-de1c28279bebbbd266e5c3020a38274e20cebb5c.tar.bz2
mv-de1c28279bebbbd266e5c3020a38274e20cebb5c.tar.xz
mv-de1c28279bebbbd266e5c3020a38274e20cebb5c.zip
Add eathena defines into actortype enum.
Diffstat (limited to 'src/actormanager.cpp')
-rw-r--r--src/actormanager.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 2367f8fd4..7a074661d 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -247,9 +247,11 @@ Being *ActorManager::createBeing(const int id,
mActors.insert(being);
if (type == ActorType::Player
- || type == ActorType::Npc
+#ifdef EATHENA_SUPPORT
|| type == ActorType::Mercenary
- || type == ActorType::Pet)
+ || type == ActorType::Pet
+#endif
+ || type == ActorType::Npc)
{
being->updateFromCache();
beingHandler->requestNameById(id);