Merge branch 'aethyra/master'

Conflicts:
	data/graphics/images/login_wallpaper.png
	src/being.cpp
	src/beingmanager.cpp
	src/engine.cpp
	src/game.cpp
	src/gui/buysell.cpp
	src/gui/buysell.h
	src/gui/gui.h
	src/gui/npc_text.cpp
	src/gui/npc_text.h
	src/gui/npcintegerdialog.cpp
	src/gui/npclistdialog.cpp
	src/gui/npclistdialog.h
	src/gui/npcstringdialog.cpp
	src/gui/sell.cpp
	src/gui/shop.cpp
	src/gui/table.cpp
	src/net/beinghandler.cpp
	src/net/npchandler.cpp
	src/net/playerhandler.cpp
	src/npc.cpp
	src/npc.h
	src/shopitem.cpp
	src/shopitem.h
	src/utils/stringutils.cpp
	src/utils/stringutils.h
	src/utils/trim.h

1 files changed, 12 insertions, 4 deletions

diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index c1c934d1..818413c2 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -64,12 +64,20 @@ void BuySellDialog::logic()
 void BuySellDialog::action(const gcn::ActionEvent &event)
 {
     setVisible(false);
-    int action;
-    if (event.getId() == "Buy") {
+    int action = 0;
+
+    NPC::isTalking = false;
+
+    if (event.getId() == "Buy")
+    {
         action = 0;
-    } else if (event.getId() == "Sell") {
+    }
+    else if (event.getId() == "Sell")
+    {
         action = 1;
-    } else if (event.getId() == "Cancel") {
+    }
+    else if (event.getId() == "Cancel")
+    {
         current_npc = 0;
         return;
     }