Merge branch '0.0' of git@gitorious.org:tmw/mainline into 0.0

1 files changed, 22 insertions, 27 deletions

diff --git a/src/text.h b/src/text.h
index 7ea96dee..995b9a58 100644
--- a/src/text.h
+++ b/src/text.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_TEXT_H
@@ -32,43 +30,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.
          */
-        ~Text();
+        void adviseXY(int x, int y);
 
         /**
-         * Draws the text
+         * Draws the text.
          */
-        virtual void
-        draw(Graphics *graphics, int xOff, int yOff);
+        virtual void draw(Graphics *graphics, int xOff, int yOff);
 
     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 */
+        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
@@ -79,18 +75,17 @@ class FlashText : public Text
                   gcn::Color colour);
 
         /**
-         * Flash the text for so many refreshes
+         * Flash the text for so many refreshes.
          */
         void flash(int time) {mTime = time; }
 
         /**
-         * Draws the 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 // _TMW_TEXT_H