diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-11-14 10:28:49 +0000 |
|---|---|---|
| committer | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-11-14 10:28:49 +0000 |
| commit | 19eaabe57c3efb6b6b8b7bd9bcde8277c71a485d (patch) | |
| tree | 647afb8c16e1938031932b5c7ddfc418d3ec14a6 /src/gui | |
| parent | 69c147510bce9aa24be5ddcb3d050a5d52e3abe7 (diff) | |
| download | Mana-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')
| -rw-r--r-- | src/gui/popupmenu.cpp | 3 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 4 |
2 files changed, 1 insertions, 6 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(); } diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 5c48c355..57c64cd6 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -357,10 +357,6 @@ Viewport::mousePressed(gcn::MouseEvent &event) if (!mMap || !player_node || player_node->mAction == Being::DEAD) return; - // Check if we are busy - if (current_npc) - return; - mPlayerFollowMouse = false; int tilex = (event.getX() + mCameraX) / 32; |