summaryrefslogtreecommitdiff
path: root/src/actormanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-21 13:44:03 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-21 13:44:03 +0300
commit46d1266f00dfde5d04d7980daea4bab02e77cb69 (patch)
treeadfaa8bdc5b96bf951de15119b1a0854e2eedc9f /src/actormanager.cpp
parentba88670fe4b5f4606f80651f6433cc755ab6b6c1 (diff)
downloadmv-46d1266f00dfde5d04d7980daea4bab02e77cb69.tar.gz
mv-46d1266f00dfde5d04d7980daea4bab02e77cb69.tar.bz2
mv-46d1266f00dfde5d04d7980daea4bab02e77cb69.tar.xz
mv-46d1266f00dfde5d04d7980daea4bab02e77cb69.zip
Use MercenaryInfo object for storing mercenary attributes.
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)