summaryrefslogtreecommitdiff
path: root/src/actormanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-11 01:00:01 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-11 01:00:01 +0300
commit2f768a34f72560ee8b2934228f548a4909533887 (patch)
tree0849395dea15a851fcec1a6236c29648cb41add7 /src/actormanager.cpp
parent05edba87ab0dae7ac4480c86655afe59cd1dd3bd (diff)
downloadmv-2f768a34f72560ee8b2934228f548a4909533887.tar.gz
mv-2f768a34f72560ee8b2934228f548a4909533887.tar.bz2
mv-2f768a34f72560ee8b2934228f548a4909533887.tar.xz
mv-2f768a34f72560ee8b2934228f548a4909533887.zip
Rename player_relations into playerRelations.
Diffstat (limited to 'src/actormanager.cpp')
-rw-r--r--src/actormanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 5f1bf8157..44e8e7cb7 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -1466,7 +1466,7 @@ void ActorManager::heal(const Being *const target) const
target->getType() != ActorType::Monster)
{
// target not enemy
- if (player_relations.getRelation(target->getName()) !=
+ if (playerRelations.getRelation(target->getName()) !=
Relation::ENEMY2)
{
if (!PacketLimiter::limitPackets(PacketType::PACKET_CHAT))
@@ -1512,7 +1512,7 @@ Being* ActorManager::findMostDamagedPlayer(const int maxTileDist) const
Being *const being = static_cast<Being*>(*it);
if ((being == nullptr) || !being->isAlive() || // don't heal dead
- player_relations.getRelation(being->getName()) ==
+ playerRelations.getRelation(being->getName()) ==
Relation::ENEMY2 || // don't heal enemy
localPlayer == being) // don't heal self
{