Merge branch 'aethyra/master'

Conflicts:
	src/being.cpp
	src/being.h
	src/floor_item.cpp
	src/floor_item.h
	src/flooritemmanager.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/itemcontainer.cpp
	src/gui/popupmenu.cpp
	src/net/beinghandler.cpp
	src/npc.cpp

1 files changed, 2 insertions, 1 deletions

diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index 6daff8fb..573e61f0 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -34,11 +34,12 @@ class SpeechBubble : public Window
 
         void setCaption(const std::string &name,
                         const gcn::Color &color = 0x000000);
-        void setText(std::string mText, bool showName = true);
+        void setText(std::string text, bool showName = true);
         void setLocation(int x, int y);
         unsigned int getNumRows();
 
     private:
+        std::string mText;
         gcn::Label *mCaption;
         TextBox *mSpeechBox;
         ScrollArea *mSpeechArea;