1 files changed, 19 insertions, 12 deletions

diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index 3b39329e..71b45fd1 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -1,37 +1,39 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_TRUETYPEFONT_H
-#define _TMW_TRUETYPEFONT_H
+#ifndef TRUETYPEFONT_H
+#define TRUETYPEFONT_H
 
+#include <list>
 #include <string>
 
 #include <guichan/font.hpp>
-#include <guichan/graphics.hpp>
-#ifdef __APPLE__
-#include <SDL_ttf/SDL_ttf.h>
-#else
+#ifndef __APPLE__
 #include <SDL/SDL_ttf.h>
+#else
+#include <SDL_ttf.h>
 #endif
 
+class TextChunk;
+
 /**
  * A wrapper around SDL_ttf for allowing the use of TrueType fonts.
  *
@@ -46,7 +48,7 @@ class TrueTypeFont : public gcn::Font
          * @param filename  Font filename.
          * @param size      Font size.
          */
-        TrueTypeFont(const std::string& filename, int size);
+        TrueTypeFont(const std::string &filename, int size);
 
         /**
          * Destructor.
@@ -60,10 +62,15 @@ class TrueTypeFont : public gcn::Font
         /**
          * @see Font::drawString
          */
-        void drawString(gcn::Graphics* graphics, const std::string& text, int x, int y);
+        void drawString(gcn::Graphics *graphics,
+                        const std::string &text,
+                        int x, int y);
 
     private:
         TTF_Font *mFont;
+
+        // Word surfaces cache
+        std::list<TextChunk> mCache;
 };
 
 #endif