summaryrefslogtreecommitdiff
path: root/src/actormanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/actormanager.cpp')
-rw-r--r--src/actormanager.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 7f4114c1c..5bb9c64aa 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -813,6 +813,7 @@ void ActorManager::logic()
if (beingEquipmentWindow)
beingEquipmentWindow->resetBeing(being);
}
+/*
else if (localPlayer && type == ActorType::Mercenary)
{
if (actor->getId() == localPlayer->getMercenary())
@@ -825,6 +826,7 @@ void ActorManager::logic()
}
}
}
+*/
if (localPlayer)
{
if (localPlayer->getTarget() == actor)