summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-11-24 19:41:46 +0300
committerAndrei Karas <akaras@inbox.ru>2014-11-24 19:41:46 +0300
commit280e7f9dcf757bed0bf652cee1a1485c695cc757 (patch)
treed19f2ec9c63907c1ba0303df3f0951d9f02aaaa4 /src
parent131e6ef514b2edb1bb4df2a004f05f3cc8f8ca8a (diff)
downloadmv-280e7f9dcf757bed0bf652cee1a1485c695cc757.tar.gz
mv-280e7f9dcf757bed0bf652cee1a1485c695cc757.tar.bz2
mv-280e7f9dcf757bed0bf652cee1a1485c695cc757.tar.xz
mv-280e7f9dcf757bed0bf652cee1a1485c695cc757.zip
Fix double warp names.
Diffstat (limited to 'src')
-rw-r--r--src/being/being.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 5ba258bf5..39f241312 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -881,14 +881,17 @@ void Being::handleSkill(Being *const victim, const int damage,
void Being::setName(const std::string &name)
{
- if (mType == ActorType::Npc || mType == ActorType::Portal)
+ if (mType == ActorType::Npc)
{
mName = name.substr(0, name.find('#', 0));
showName();
}
else
{
- mName = name;
+ if (mType == ActorType::Portal)
+ mName = name.substr(0, name.find('#', 0));
+ else
+ mName = name;
if (getShowName())
showName();