From 46d1266f00dfde5d04d7980daea4bab02e77cb69 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 21 Sep 2014 13:44:03 +0300
Subject: Use MercenaryInfo object for storing mercenary attributes.

---
 src/actormanager.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/actormanager.cpp')

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