Merged with Aethyra master as of 2009-02-09

Conflicts:
	A lot of files...

1 files changed, 4 insertions, 4 deletions

diff --git a/src/text.h b/src/text.h
index 9895ab30..6dcfd90a 100644
--- a/src/text.h
+++ b/src/text.h
@@ -23,11 +23,11 @@
 #ifndef TEXT_H
 #define TEXT_H
 
+#include <guichan/color.hpp>
+
 #include "graphics.h"
 #include "guichanfwd.h"
 
-#include <list>
-
 class TextManager;
 
 class Text
@@ -55,7 +55,7 @@ class Text
         /**
          * Draws the text.
          */
-        virtual void draw(Graphics *graphics, int xOff, int yOff);
+        virtual void draw(gcn::Graphics *graphics, int xOff, int yOff);
 
     private:
         int mX;                /**< Actual x-value of left of text written. */
@@ -93,7 +93,7 @@ class FlashText : public Text
         /**
          * Draws the text.
          */
-        virtual void draw(Graphics *graphics, int xOff, int yOff);
+        virtual void draw(gcn::Graphics *graphics, int xOff, int yOff);
 
     private:
         int mTime;             /**< Time left for flashing */