From ba07ca55476c488504a8d8bf9318f15aab687f12 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 21 Sep 2014 14:44:03 +0300
Subject: Fix mercenary removing.

---
 src/actormanager.cpp | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'src/actormanager.cpp')

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)
-- 
cgit v1.2.3-70-g09d2