Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'

Conflicts:
	AUTHORS
	CMakeLists.txt
	ChangeLog
	INSTALL
	README
	aethyra.cbp
	configure.ac
	data/help/changes.txt
	data/help/commands.txt
	data/help/header.txt
	data/help/support.txt
	src/Makefile.am
	src/aethyra.rc
	src/being.cpp
	src/being.h
	src/equipment.cpp
	src/equipment.h
	src/floor_item.h
	src/game.cpp
	src/gui/buddywindow.cpp
	src/gui/char_select.cpp
	src/gui/char_server.cpp
	src/gui/chat.cpp
	src/gui/chat.h
	src/gui/equipmentwindow.cpp
	src/gui/equipmentwindow.h
	src/gui/gui.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/itemcontainer.cpp
	src/gui/itemcontainer.h
	src/gui/minimap.cpp
	src/gui/ministatus.cpp
	src/gui/newskill.cpp
	src/gui/npc_text.cpp
	src/gui/npclistdialog.h
	src/gui/ok_dialog.cpp
	src/gui/setup_video.cpp
	src/gui/skill.cpp
	src/gui/skill.h
	src/gui/status.h
	src/gui/table_model.h
	src/gui/updatewindow.cpp
	src/gui/viewport.cpp
	src/inventory.cpp
	src/inventory.h
	src/keyboardconfig.cpp
	src/keyboardconfig.h
	src/localplayer.cpp
	src/localplayer.h
	src/logindata.h
	src/main.cpp
	src/map.cpp
	src/monster.cpp
	src/monster.h
	src/net/beinghandler.cpp
	src/net/beinghandler.h
	src/net/buysellhandler.cpp
	src/net/equipmenthandler.cpp
	src/net/loginhandler.cpp
	src/net/loginhandler.h
	src/net/network.h
	src/net/npchandler.cpp
	src/net/playerhandler.cpp
	src/net/protocol.h
	src/net/tradehandler.cpp
	src/npc.cpp
	src/npc.h
	src/particleemitter.cpp
	src/particleemitterprop.h
	src/player.cpp
	src/player.h
	src/player_relations.cpp
	src/resources/imageset.cpp
	src/resources/imageset.h
	src/resources/itemdb.cpp
	src/resources/mapreader.cpp
	src/resources/monsterinfo.h
	src/text.cpp
	src/text.h
	src/textmanager.cpp
	src/textmanager.h
	src/tileset.h
	src/utils/fastsqrt.h
	src/utils/strprintf.cpp
	src/winver.h
	tools/tmxcopy/Makefile
	tools/tmxcopy/base64.cpp
	tools/tmxcopy/base64.h
	tools/tmxcopy/tostring.h

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 21 insertions, 24 deletions

diff --git a/src/text.h b/src/text.h
index a370771d..173a5686 100644
--- a/src/text.h
+++ b/src/text.h
@@ -31,43 +31,41 @@ class TextManager;
 
 class Text
 {
-        friend class TextManager;
+    friend class TextManager;
+
     public:
         /**
-         * Constructor creates a text object to display on the screen
+         * Constructor creates a text object to display on the screen.
          */
         Text(const std::string &text, int x, int y,
              gcn::Graphics::Alignment alignment, gcn::Font *font,
              gcn::Color colour);
 
         /**
-         * Allows the originator of the text to specify the ideal coordinates
+         * Destructor. The text is removed from the screen.
          */
-        void
-        adviseXY(int x, int y);
+        virtual ~Text();
 
         /**
-         * Remove the text from the screen
+         * Allows the originator of the text to specify the ideal coordinates.
          */
-        virtual ~Text();
+        void adviseXY(int x, int y);
 
         /**
-         * Draws the text
+         * Draws the text.
          */
-        virtual void
-        draw(Graphics *graphics, int xOff, int yOff);
-
-    protected:
+        virtual void draw(Graphics *graphics, int xOff, int yOff);
 
-        int mX; /**< Actual x-value of left of text written */
-        int mY; /**< Actual y-value of top of text written */
-        int mWidth; /**< The width of the text */
-        int mHeight; /**< The height of the text */
-        int mXOffset; /**< The offset of mX from the desired x */
-        static int mInstances; /**< Instances of text */
-        gcn::Font *mFont; /**< The font used */
-        std::string mText; /**< The text to display */
-        gcn::Color mColour; /**< The colour of the text */
+    private:
+        int mX;                /**< Actual x-value of left of text written. */
+        int mY;                /**< Actual y-value of top of text written. */
+        int mWidth;            /**< The width of the text. */
+        int mHeight;           /**< The height of the text. */
+        int mXOffset;          /**< The offset of mX from the desired x. */
+        static int mInstances; /**< Instances of text. */
+        gcn::Font *mFont;      /**< The font used. */
+        std::string mText;     /**< The text to display. */
+        gcn::Color mColour;    /**< The colour of the text. */
 };
 
 class FlashText : public Text
@@ -90,10 +88,9 @@ class FlashText : public Text
         /**
          * Draws the text
          */
-        virtual void
-        draw(Graphics *graphics, int xOff, int yOff);
+        virtual void draw(Graphics *graphics, int xOff, int yOff);
 
     private:
-        int mTime; /**< Time left for flashing */
+        int mTime;             /**< Time left for flashing */
 };
 #endif