summaryrefslogtreecommitdiff
path: root/src/gui/userpalette.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-03-16 14:38:27 -0600
committerJared Adams <jaxad0127@gmail.com>2010-03-16 14:44:47 -0600
commitd0df8c76bcd0a5920a9ef1861d978ff52d021a02 (patch)
tree29d77d4fb880b6ba6ae819752798b06a2a656219 /src/gui/userpalette.cpp
parent0698461bd4001c6a1e3be1d755b3ebbafe229d42 (diff)
downloadmana-d0df8c76bcd0a5920a9ef1861d978ff52d021a02.tar.gz
mana-d0df8c76bcd0a5920a9ef1861d978ff52d021a02.tar.bz2
mana-d0df8c76bcd0a5920a9ef1861d978ff52d021a02.tar.xz
mana-d0df8c76bcd0a5920a9ef1861d978ff52d021a02.zip
Fix some color issues
Colors in BrowserBoxes generally didn't work. Also simplify much palette control detail. Reviewed-by: Thorbjørn Lindeijer
Diffstat (limited to 'src/gui/userpalette.cpp')
-rw-r--r--src/gui/userpalette.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index 71cb054c..0f30b752 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -213,9 +213,8 @@ int UserPalette::getColorTypeAt(int i)
return mColors[i].type;
}
-void UserPalette::addColor(int type, int rgb,
- Palette::GradientType grad, const std::string &text,
- char c, int delay)
+void UserPalette::addColor(int type, int rgb, Palette::GradientType grad,
+ const std::string &text, int delay)
{
const std::string &configName = ColorTypeNames[type];
char buffer[20];
@@ -230,7 +229,8 @@ void UserPalette::addColor(int type, int rgb,
gcn::Color trueCol = rgbValue;
grad = (GradientType) config.getValue(configName + "Gradient", grad);
delay = (int) config.getValue(configName + "Delay", delay);
- mColors[type].set(type, trueCol, grad, text, c, delay);
+ mColors[type].set(type, trueCol, grad, delay);
+ mColors[type].text = text;
if (grad != STATIC)
mGradVector.push_back(&mColors[type]);