summaryrefslogtreecommitdiff
path: root/src/being/being.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-16 16:06:17 +0300
committerAndrei Karas <akaras@inbox.ru>2015-11-16 16:06:17 +0300
commit1b28203031aec74f7a11a46fb5267f642ae5fab2 (patch)
treeef907d1a54132db7704e10a633925182edbe2fb5 /src/being/being.cpp
parent0977134ffdad9ea0e79106fc633ebafd18209765 (diff)
downloadmv-1b28203031aec74f7a11a46fb5267f642ae5fab2.tar.gz
mv-1b28203031aec74f7a11a46fb5267f642ae5fab2.tar.bz2
mv-1b28203031aec74f7a11a46fb5267f642ae5fab2.tar.xz
mv-1b28203031aec74f7a11a46fb5267f642ae5fab2.zip
Fix code style.
Diffstat (limited to 'src/being/being.cpp')
-rw-r--r--src/being/being.cpp23
1 files changed, 23 insertions, 0 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 31b0ddcc9..bca500fe8 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -270,8 +270,12 @@ Being::Being(const BeingId id,
mGotComment = true;
}
+#ifdef EATHENA_SUPPORT
if (mType == ActorType::Portal ||
mType == ActorType::SkillUnit)
+#else
+ if (mType == ActorType::Portal)
+#endif
{
mShowName = false;
}
@@ -1486,9 +1490,14 @@ void Being::setAction(const BeingActionT &action, const int attackId)
this,
false,
mX, mY);
+#ifdef EATHENA_SUPPORT
if (mType == ActorType::Monster ||
mType == ActorType::Npc ||
mType == ActorType::SkillUnit)
+#else
+ if (mType == ActorType::Monster ||
+ mType == ActorType::Npc)
+#endif
{
mYDiff = mInfo->getDeadSortOffsetY();
}
@@ -1723,6 +1732,7 @@ void Being::logic()
case BeingAction::DEAD:
case BeingAction::HURT:
case BeingAction::SPAWN:
+ case BeingAction::CAST:
default:
break;
@@ -1944,6 +1954,7 @@ void Being::petLogic()
case BeingAction::MOVE:
case BeingAction::HURT:
case BeingAction::SPAWN:
+ case BeingAction::CAST:
case BeingAction::PRESTAND:
default:
directionType = mInfo->getDirectionType();
@@ -2299,6 +2310,7 @@ void Being::updateColors()
setDefaultNameColor(UserColorId::NPC);
mTextColor = &userPalette->getColor(UserColorId::NPC);
}
+#ifdef EATHENA_SUPPORT
else if (mType == ActorType::Pet)
{
setDefaultNameColor(UserColorId::PET);
@@ -2314,6 +2326,14 @@ void Being::updateColors()
setDefaultNameColor(UserColorId::SKILLUNIT);
mTextColor = &userPalette->getColor(UserColorId::SKILLUNIT);
}
+#endif
+#ifdef TMWA_SUPPORT
+ else if (mType == ActorType::LocalPet)
+ {
+ setDefaultNameColor(UserColorId::PET);
+ mTextColor = &userPalette->getColor(UserColorId::PET);
+ }
+#endif
else if (this == localPlayer)
{
mNameColor = &userPalette->getColor(UserColorId::SELF);
@@ -3432,6 +3452,7 @@ std::string Being::loadComment(const std::string &name,
case ActorType::Mercenary:
case ActorType::Homunculus:
case ActorType::Pet:
+ case ActorType::SkillUnit:
#endif
default:
return "";
@@ -3471,6 +3492,7 @@ void Being::saveComment(const std::string &restrict name,
case ActorType::Pet:
case ActorType::Mercenary:
case ActorType::Homunculus:
+ case ActorType::SkillUnit:
#endif
default:
return;
@@ -3792,6 +3814,7 @@ void Being::fixPetSpawnPos(int &dstX, int &dstY) const
case BeingAction::HURT:
case BeingAction::STAND:
case BeingAction::PRESTAND:
+ case BeingAction::CAST:
default:
offsetX1 = mInfo->getTargetOffsetX();
offsetY1 = mInfo->getTargetOffsetY();