diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-19 19:51:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-20 13:55:42 +0300 |
| commit | dbba47eabe087d503426b5c5862aaa9263861ea5 (patch) | |
| tree | 3255ae8f5522368e3380f23f9733f2943bf7c438 /src/gui/palette.h | |
| parent | 45210c4fd718e75ba47171fc6b28da04df668ef9 (diff) | |
| download | manaplus-dbba47eabe087d503426b5c5862aaa9263861ea5.tar.gz manaplus-dbba47eabe087d503426b5c5862aaa9263861ea5.tar.bz2 manaplus-dbba47eabe087d503426b5c5862aaa9263861ea5.tar.xz manaplus-dbba47eabe087d503426b5c5862aaa9263861ea5.zip | |
Fix possible shadow methods in palette class.
Diffstat (limited to 'src/gui/palette.h')
| -rw-r--r-- | src/gui/palette.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/palette.h b/src/gui/palette.h index ed9b14e22..51c60cb8f 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -67,7 +67,7 @@ class Palette * * @return the requested color or Palette::BLACK */ - const gcn::Color &getColor(const signed char c, bool &valid); + const gcn::Color &getCharColor(const signed char c, bool &valid); /** * Gets the color associated with the type. Sets the alpha channel |