summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFreeyorp <Freeyorp101@hotmail.com>2009-08-31 21:26:06 +1200
committerFreeyorp <Freeyorp101@hotmail.com>2009-08-31 21:42:24 +1200
commitf7d11d6734940c509bcc676e464b939edc7f84a6 (patch)
treeaedf0d93dd0404fddac23079daf7386b414e8e7f /src
parent37d3a8160186741e349eb1b2d12379cb06afc8e6 (diff)
downloadmana-f7d11d6734940c509bcc676e464b939edc7f84a6.tar.gz
mana-f7d11d6734940c509bcc676e464b939edc7f84a6.tar.bz2
mana-f7d11d6734940c509bcc676e464b939edc7f84a6.tar.xz
mana-f7d11d6734940c509bcc676e464b939edc7f84a6.zip
Fixes NPC names on the popup menu.
Mantis-issue: 861
Diffstat (limited to 'src')
-rw-r--r--src/gui/popupmenu.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 0f0df756..6795f29d 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -73,9 +73,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
mBeingId = being->getId();
mBrowserBox->clearRows();
- const std::string &name = being->getType() == Being::NPC ?
- being->getName().substr(0, being->getName().size()
- - 6) : being->getName();
+ const std::string &name = being->getName();
switch (being->getType())
{
@@ -343,9 +341,7 @@ void PopupMenu::handleLink(const std::string &link)
else if (link == "name" && being)
{
- const std::string &name = being->getType() == Being::NPC ?
- being->getName().substr(0,
- being->getName().size() - 6) : being->getName();
+ const std::string &name = being->getName();
chatWindow->addInputText(name);
}