From a4e455a2ce74cac174bf1ae00f4f95e2b65c7374 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 20 Sep 2014 15:07:13 +0300
Subject: eathena: set mercenary name and some other basic stats.

---
 src/being/being.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/being/being.cpp')

diff --git a/src/being/being.cpp b/src/being/being.cpp
index f52371d78..40d20fe98 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -221,7 +221,7 @@ Being::Being(const int id,
     setMap(map);
     setSubtype(subtype, 0);
 
-    if (mType == ActorType::Player)
+    if (mType == ActorType::Player || mType == ActorType::Mercenary)
         mShowName = config.getBoolValue("visiblenames");
     else if (mType != ActorType::Npc)
         mGotComment = true;
@@ -838,7 +838,7 @@ void Being::setName(const std::string &name)
     {
         mName = name;
 
-        if (mType == ActorType::Player && getShowName())
+        if (getShowName())
             showName();
     }
 }
-- 
cgit v1.2.3-70-g09d2