From aadf40739c45c3396ace5766dd9c60db0c3b1ccc Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 May 2015 17:45:27 +0300 Subject: Move relation enum into separate file. --- src/actormanager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/actormanager.cpp') 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(*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; } -- cgit v1.2.3-70-g09d2