summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/palette.cpp20
-rw-r--r--src/gui/setup_colors.cpp1
2 files changed, 9 insertions, 12 deletions
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index 8cc9c57b..e007dd5c 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -82,8 +82,8 @@ Palette::Palette() :
{
std::string indent = " ";
addColor(TEXT, 0x000000, STATIC, _("Text"));
- addColor(SHADOW, 0x000000, STATIC, indent + _("Text Shadow"), 0);
- addColor(OUTLINE, 0x000000, STATIC, indent + _("Text Outline"), 0);
+ addColor(SHADOW, 0x000000, STATIC, indent + _("Text Shadow"));
+ addColor(OUTLINE, 0x000000, STATIC, indent + _("Text Outline"));
addColor(BACKGROUND, 0xffffff, STATIC, _("Background"));
@@ -122,17 +122,15 @@ Palette::Palette() :
addColor(ARMS, 0x9c24e8, STATIC, indent + _("Arms"));
addColor(AMMO, 0x8b6311, STATIC, indent + _("Ammo"));
- addColor(PARTICLE, 0xffffff, STATIC, _("Particle Effects"), 0);
- addColor(PICKUP_INFO, 0x28dc28, STATIC, indent + _("Pickup Notification"),
- 0);
- addColor(EXP_INFO, 0xffff00, STATIC, indent + _("Exp Notification"),0);
+ addColor(PARTICLE, 0xffffff, STATIC, _("Particle Effects"));
+ addColor(PICKUP_INFO, 0x28dc28, STATIC, indent + _("Pickup Notification"));
+ addColor(EXP_INFO, 0xffff00, STATIC, indent + _("Exp Notification"));
addColor(HIT_PLAYER_MONSTER, 0x0064ff, STATIC,
- indent + _("Player hits Monster"), 0);
+ indent + _("Player hits Monster"));
addColor(HIT_MONSTER_PLAYER, 0xff3232, STATIC,
- indent + _("Monster hits Player"), 0);
- addColor(HIT_CRITICAL, 0xff0000, RAINBOW,
- indent + _("Critical Hit"), 0);
- addColor(MISS, 0xffff00, STATIC, indent + _("Misses"), 0);
+ indent + _("Monster hits Player"));
+ addColor(HIT_CRITICAL, 0xff0000, RAINBOW, indent + _("Critical Hit"));
+ addColor(MISS, 0xffff00, STATIC, indent + _("Misses"));
commit(true);
}
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 0dfaf7a6..91b20f5f 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -198,7 +198,6 @@ void Setup_Colors::action(const gcn::ActionEvent &event)
case Palette::HIGHLIGHT:
case Palette::SHOP_WARNING:
mTextPreview->setTextBGColor(col);
- //mTextPreview->setOpaque(true);
mTextPreview->setOutline(false);
mTextPreview->setShadow(false);
mPreview->addRow(rawmsg);