Merge branch 'aethyra/master'

Conflicts:
	Many files.

1 files changed, 20 insertions, 2 deletions

diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index 34e00722..8bb0e5ea 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -23,21 +23,39 @@
 #define SPEECHBUBBLE_H
 
 #include "palette.h"
-#include "window.h"
+#include "popup.h"
 
 class ScrollArea;
 class TextBox;
 
-class SpeechBubble : public Window
+class SpeechBubble : public Popup
 {
     public:
+        /**
+         * Constructor. Initializes the speech bubble.
+         */
         SpeechBubble();
 
+        /**
+         * Sets the name displayed for the speech bubble, and in what color.
+         */
         void setCaption(const std::string &name,
                         const gcn::Color *color =
                         &guiPalette->getColor(Palette::TEXT));
+
+        /**
+         * Sets the text to be displayed.
+         */
         void setText(std::string text, bool showName = true);
+
+        /**
+         * Sets the location in which the speech bubble will be displayed.
+         */
         void setLocation(int x, int y);
+
+        /**
+         * Gets the number of rows the speech bubble has.
+         */
         unsigned int getNumRows();
 
     private: