From 19eaabe57c3efb6b6b8b7bd9bcde8277c71a485d Mon Sep 17 00:00:00 2001 From: Guillaume Melquiond Date: Wed, 14 Nov 2007 10:28:49 +0000 Subject: Experimented with non-stuck gaming when talking to NPCs. --- ChangeLog | 2 ++ src/game.cpp | 1 - src/gui/popupmenu.cpp | 3 +-- src/gui/viewport.cpp | 4 ---- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0782f0f9..47f6f28e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ * src/gui/inttextbox.h, src/gui/inttextbox.cpp: Changed to textfield so that it is visibly editable. * src/gui/item_amount.cpp: Converted to layout handler. + * src/game.cpp, src/gui/viewport.cpp, src/gui/popupmenu.cpp: Removed + tests on current_npc. 2007-11-13 Eugenio Favalli diff --git a/src/game.cpp b/src/game.cpp index b4887f5b..4bf42a2d 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -673,7 +673,6 @@ void Game::handleInput() } // Moving player around if (player_node->mAction != Being::DEAD && - current_npc == 0 && !chatWindow->isFocused()) { // Get the state of the keyboard keys 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(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; -- cgit v1.2.3-70-g09d2