summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-20 15:07:13 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-20 15:07:13 +0300
commita4e455a2ce74cac174bf1ae00f4f95e2b65c7374 (patch)
tree46e840678d9274d1f37cc6563320c366c0f4ce8e /src/being
parent2f8076f6c51cd969da927d12d6cd89a46899322e (diff)
downloadmv-a4e455a2ce74cac174bf1ae00f4f95e2b65c7374.tar.gz
mv-a4e455a2ce74cac174bf1ae00f4f95e2b65c7374.tar.bz2
mv-a4e455a2ce74cac174bf1ae00f4f95e2b65c7374.tar.xz
mv-a4e455a2ce74cac174bf1ae00f4f95e2b65c7374.zip
eathena: set mercenary name and some other basic stats.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp4
1 files changed, 2 insertions, 2 deletions
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();
}
}