From 280e7f9dcf757bed0bf652cee1a1485c695cc757 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 24 Nov 2014 19:41:46 +0300 Subject: Fix double warp names. --- src/being/being.cpp | 7 +++++-- 1 file 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(); -- cgit v1.2.3-60-g2f50