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, 6 insertions, 5 deletions

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 520efad4..954f22d8 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -64,6 +64,12 @@ NpcTextDialog::NpcTextDialog(Network *network):
     setLocationRelativeTo(getParent());
 }
 
+void NpcTextDialog::clearText()
+{
+    NPC::isTalking = false;
+    setText("");
+}
+
 void NpcTextDialog::setText(const std::string &text)
 {
     mText = text;
@@ -76,11 +82,6 @@ void NpcTextDialog::addText(const std::string &text)
     mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
 }
 
-void NpcTextDialog::clearText()
-{
-    setText("");
-}
-
 void NpcTextDialog::showNextButton()
 {
     mButton->setCaption(_("Next"));