summaryrefslogtreecommitdiff
path: root/src/gui/palette.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-19 19:51:57 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-20 13:55:42 +0300
commitdbba47eabe087d503426b5c5862aaa9263861ea5 (patch)
tree3255ae8f5522368e3380f23f9733f2943bf7c438 /src/gui/palette.cpp
parent45210c4fd718e75ba47171fc6b28da04df668ef9 (diff)
downloadManaVerse-dbba47eabe087d503426b5c5862aaa9263861ea5.tar.gz
ManaVerse-dbba47eabe087d503426b5c5862aaa9263861ea5.tar.bz2
ManaVerse-dbba47eabe087d503426b5c5862aaa9263861ea5.tar.xz
ManaVerse-dbba47eabe087d503426b5c5862aaa9263861ea5.zip
Fix possible shadow methods in palette class.
Diffstat (limited to 'src/gui/palette.cpp')
-rw-r--r--src/gui/palette.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index 558a977b5..092a0daae 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -64,7 +64,7 @@ Palette::~Palette()
mInstances.erase(this);
}
-const gcn::Color& Palette::getColor(const signed char c, bool &valid)
+const gcn::Color& Palette::getCharColor(const signed char c, bool &valid)
{
const CharColors::const_iterator it = mCharColors.find(c);
if (it != mCharColors.end())