summaryrefslogtreecommitdiff
path: root/src/being
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/being
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/being')
-rw-r--r--src/being/being.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index af989ff65..523d19331 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -236,9 +236,12 @@ Being::Being(const int id,
setSubtype(subtype, 0);
if (mType == ActorType::Player
+#ifdef EATHENA_SUPPORT
|| mType == ActorType::Mercenary
|| mType == ActorType::Pet
- || mType == ActorType::Homunculus)
+ || mType == ActorType::Homunculus
+#endif
+ )
{
mShowName = config.getBoolValue("visiblenames");
}
@@ -332,6 +335,7 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look)
mYDiff = mInfo->getSortOffsetY();
}
}
+#ifdef EATHENA_SUPPORT
if (mType == ActorType::Pet)
{
mInfo = PETDB::get(mSubType);
@@ -365,6 +369,7 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look)
mYDiff = mInfo->getSortOffsetY();
}
}
+#endif
else if (mType == ActorType::Npc)
{
mInfo = NPCDB::get(mSubType);
@@ -612,9 +617,12 @@ void Being::takeDamage(Being *const attacker,
}
}
else if (mType == ActorType::Monster
+#ifdef EATHENA_SUPPORT
|| mType == ActorType::Mercenary
|| mType == ActorType::Pet
- || mType == ActorType::Homunculus)
+ || mType == ActorType::Homunculus
+#endif
+ )
{
if (attacker == localPlayer)
{
@@ -3055,9 +3063,11 @@ std::string Being::loadComment(const std::string &name,
case ActorType::Portal:
case ActorType::LocalPet:
case ActorType::Avatar:
+#ifdef EATHENA_SUPPORT
case ActorType::Mercenary:
case ActorType::Homunculus:
case ActorType::Pet:
+#endif
default:
return "";
}