diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
commit | fa2f3ac593a792c32095c2e885665ec91bb4019d (patch) | |
tree | f44aee845f0229dfcc6b2ad3c74613e0352f36c2 /src/gui/colour.h | |
parent | 07f7d52f661a74e6d0c780ca53e724651e3dcc48 (diff) | |
parent | 40edf4e91558cffd83d9015a2cf4a16360e27855 (diff) | |
download | mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.gz mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.bz2 mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.xz mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.zip |
Merged with Aethyra master as of 2009-02-09
Conflicts:
A lot of files...
Diffstat (limited to 'src/gui/colour.h')
-rw-r--r-- | src/gui/colour.h | 9 |
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); |