summaryrefslogtreecommitdiff
path: root/src/actormanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-21 14:44:03 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-21 14:44:03 +0300
commitba07ca55476c488504a8d8bf9318f15aab687f12 (patch)
tree3907bcceabda445a9fa8498ff92af09df2c11e08 /src/actormanager.cpp
parent46d1266f00dfde5d04d7980daea4bab02e77cb69 (diff)
downloadmv-ba07ca55476c488504a8d8bf9318f15aab687f12.tar.gz
mv-ba07ca55476c488504a8d8bf9318f15aab687f12.tar.bz2
mv-ba07ca55476c488504a8d8bf9318f15aab687f12.tar.xz
mv-ba07ca55476c488504a8d8bf9318f15aab687f12.zip
Fix mercenary removing.
Diffstat (limited to 'src/actormanager.cpp')
-rw-r--r--src/actormanager.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 5bb9c64aa..0f30fa215 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -813,20 +813,6 @@ void ActorManager::logic()
if (beingEquipmentWindow)
beingEquipmentWindow->resetBeing(being);
}
-/*
- else if (localPlayer && type == ActorType::Mercenary)
- {
- if (actor->getId() == localPlayer->getMercenary())
- {
- localPlayer->setMercenary(0);
- if (skillDialog)
- {
- skillDialog->hideSkills(SkillOwner::Mercenary);
- skillDialog->updateModels();
- }
- }
- }
-*/
if (localPlayer)
{
if (localPlayer->getTarget() == actor)