From ebd21ed95b475d7a411bc6d341fb287b0c125509 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 20 Sep 2014 19:12:19 +0300
Subject: Remove mercenary skills if mercenary was removed.

---
 src/net/eathena/mercenaryhandler.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/net/eathena/mercenaryhandler.cpp')

diff --git a/src/net/eathena/mercenaryhandler.cpp b/src/net/eathena/mercenaryhandler.cpp
index 2a44e86ca..63c43f093 100644
--- a/src/net/eathena/mercenaryhandler.cpp
+++ b/src/net/eathena/mercenaryhandler.cpp
@@ -24,6 +24,7 @@
 #include "logger.h"
 
 #include "being/being.h"
+#include "being/localplayer.h"
 #include "being/playerinfo.h"
 
 #include "gui/windows/skilldialog.h"
@@ -110,6 +111,8 @@ void MercenaryHandler::processMercenaryInfo(Net::MessageIn &msg)
         dstBeing->setName(name);
         dstBeing->setLevel(level);
         dstBeing->setAttackRange(range);
+        if (localPlayer)
+            localPlayer->setMercenary(dstBeing->getId());
     }
 }
 
-- 
cgit v1.2.3-70-g09d2