summaryrefslogtreecommitdiff
path: root/src/actormanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-30 17:45:27 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-30 17:45:27 +0300
commitaadf40739c45c3396ace5766dd9c60db0c3b1ccc (patch)
treea6d2ca5fb86849ae18586b728bfcd9e716f5635f /src/actormanager.cpp
parent2a33b736dc93251bf7a72364c5f818142362a3ce (diff)
downloadmv-aadf40739c45c3396ace5766dd9c60db0c3b1ccc.tar.gz
mv-aadf40739c45c3396ace5766dd9c60db0c3b1ccc.tar.bz2
mv-aadf40739c45c3396ace5766dd9c60db0c3b1ccc.tar.xz
mv-aadf40739c45c3396ace5766dd9c60db0c3b1ccc.zip
Move relation enum into separate file.
Diffstat (limited to 'src/actormanager.cpp')
-rw-r--r--src/actormanager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 121f5e3f3..48ff9fa19 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -1251,7 +1251,7 @@ void ActorManager::heal(const Being *const target) const
{
// target not enemy
if (player_relations.getRelation(target->getName()) !=
- PlayerRelation::ENEMY2)
+ Relation::ENEMY2)
{
if (!PacketLimiter::limitPackets(PACKET_CHAT))
return;
@@ -1294,10 +1294,10 @@ Being* ActorManager::findMostDamagedPlayer() const
Being *const being = static_cast<Being*>(*it);
- if ((!being) || (!being->isAlive()) || // don't heal dead
+ if ((!being) || (!being->isAlive()) || // don't heal dead
(player_relations.getRelation(being->getName()) ==
- PlayerRelation::ENEMY2) || // don't heal enemy
- (localPlayer == being)) // don't heal self
+ Relation::ENEMY2) || // don't heal enemy
+ (localPlayer == being)) // don't heal self
{
continue;
}