summaryrefslogtreecommitdiff
path: root/src/gui/popupmenu.cpp
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-11-14 10:28:49 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-11-14 10:28:49 +0000
commit19eaabe57c3efb6b6b8b7bd9bcde8277c71a485d (patch)
tree647afb8c16e1938031932b5c7ddfc418d3ec14a6 /src/gui/popupmenu.cpp
parent69c147510bce9aa24be5ddcb3d050a5d52e3abe7 (diff)
downloadmana-19eaabe57c3efb6b6b8b7bd9bcde8277c71a485d.tar.gz
mana-19eaabe57c3efb6b6b8b7bd9bcde8277c71a485d.tar.bz2
mana-19eaabe57c3efb6b6b8b7bd9bcde8277c71a485d.tar.xz
mana-19eaabe57c3efb6b6b8b7bd9bcde8277c71a485d.zip
Experimented with non-stuck gaming when talking to NPCs.
Diffstat (limited to 'src/gui/popupmenu.cpp')
-rw-r--r--src/gui/popupmenu.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index aeb6637d..a1148379 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -123,8 +123,7 @@ void PopupMenu::handleLink(const std::string& link)
// Talk To action
if (link == "talk" &&
mBeing != NULL &&
- mBeing->getType() == Being::NPC &&
- current_npc == 0)
+ mBeing->getType() == Being::NPC)
{
static_cast<NPC*>(mBeing)->talk();
}