Merged with Aethyra master as of 2009-02-09

Conflicts:
	A lot of files...

1 files changed, 6 insertions, 3 deletions

diff --git a/src/gui/colour.h b/src/gui/colour.h
index 1ffe6e30..6ea02840 100644
--- a/src/gui/colour.h
+++ b/src/gui/colour.h
@@ -22,14 +22,11 @@
 #ifndef COLOUR_H
 #define COLOUR_H
 
-#include <cstdio>
 #include <string>
 #include <vector>
 
 #include <guichan/listmodel.hpp>
 
-#include "../guichanfwd.h"
-
 class Colour : public gcn::ListModel
 {
     public:
@@ -91,6 +88,12 @@ class Colour : public gcn::ListModel
         int getColourAt(int i);
 
         /**
+         * Get the character used by the colour for the element at index i in
+         * the current colour model
+         */
+        char getColourCharAt(int i);
+
+        /**
          * Set the colour for the element at index i
          */
         void setColourAt(int i, int rgb);