summaryrefslogtreecommitdiff
path: root/src/being/localplayer.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-13 01:04:05 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-13 01:04:05 +0300
commitea0b61e18f36f28806940b00a2cddaef912c3340 (patch)
tree616205f44832d4ced4fc0b50b650eedb0fbf435c /src/being/localplayer.cpp
parent814e88e5ca69bc54837be27429dbf42dd41f7ac6 (diff)
downloadmanaverse-ea0b61e18f36f28806940b00a2cddaef912c3340.tar.gz
manaverse-ea0b61e18f36f28806940b00a2cddaef912c3340.tar.bz2
manaverse-ea0b61e18f36f28806940b00a2cddaef912c3340.tar.xz
manaverse-ea0b61e18f36f28806940b00a2cddaef912c3340.zip
Move actor type into separate file.
Diffstat (limited to 'src/being/localplayer.cpp')
-rw-r--r--src/being/localplayer.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 2774ab86e..d22e8503c 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -101,7 +101,7 @@ extern MiniStatusWindow *miniStatusWindow;
extern SkillDialog *skillDialog;
LocalPlayer::LocalPlayer(const int id, const int subtype) :
- Being(id, PLAYER, subtype, nullptr),
+ Being(id, ActorType::PLAYER, subtype, nullptr),
AttributeListener(),
StatListener(),
mGMLevel(0),
@@ -295,7 +295,7 @@ void LocalPlayer::logic()
if (mTarget)
{
- if (mTarget->getType() == ActorSprite::NPC)
+ if (mTarget->getType() == ActorType::NPC)
{
// NPCs are always in range
mTarget->setTargetType(TCT_IN_RANGE);
@@ -314,7 +314,7 @@ void LocalPlayer::logic()
mTarget->setTargetType(targetType);
if (!mTarget->isAlive() && (!mTargetDeadPlayers
- || mTarget->getType() != Being::PLAYER))
+ || mTarget->getType() != ActorType::PLAYER))
{
stopAttack(true);
}
@@ -532,7 +532,7 @@ void LocalPlayer::setTarget(Being *const target)
oldTarget = mTarget;
}
- if (mTarget && mTarget->getType() == ActorSprite::MONSTER)
+ if (mTarget && mTarget->getType() == ActorType::MONSTER)
mTarget->setShowName(false);
mTarget = target;
@@ -547,7 +547,7 @@ void LocalPlayer::setTarget(Being *const target)
mTarget->updateName();
}
- if (target && target->getType() == ActorSprite::MONSTER)
+ if (target && target->getType() == ActorType::MONSTER)
target->setShowName(true);
}
@@ -731,7 +731,7 @@ void LocalPlayer::attack(Being *const target, const bool keep,
{
mKeepAttacking = keep;
- if (!target || target->getType() == ActorSprite::NPC)
+ if (!target || target->getType() == ActorType::NPC)
return;
if (mTarget != target)
@@ -761,7 +761,7 @@ void LocalPlayer::attack(Being *const target, const bool keep,
mActionTime = tick_time;
- if (target->getType() != Being::PLAYER || checAttackPermissions(target))
+ if (target->getType() != ActorType::PLAYER || checAttackPermissions(target))
{
setAction(BeingAction::ATTACK);
@@ -3297,7 +3297,7 @@ void LocalPlayer::attack2(Being *const target, const bool keep,
return;
}
setTarget(target);
- if (target->getType() != Being::NPC)
+ if (target->getType() != ActorType::NPC)
{
mKeepAttacking = true;
moveToTarget();
@@ -3510,7 +3510,7 @@ void LocalPlayer::followMoveTo(const Being *const being,
if (actorManager)
{
Being *const b = actorManager->findBeingByName(
- mPlayerFollowed, Being::PLAYER);
+ mPlayerFollowed, ActorType::PLAYER);
setTarget(b);
}
}
@@ -3665,7 +3665,7 @@ void LocalPlayer::checkNewName(Being *const being)
return;
const std::string &nick = being->getName();
- if (being->getType() == ActorSprite::PLAYER)
+ if (being->getType() == ActorType::PLAYER)
{
const Guild *const guild = getGuild();
if (guild)