From dd169e1dcb4298f3d38e0ee0c13180ed0807d96a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 5 May 2013 12:27:02 +0300
Subject: dehardcode floor item color.

---
 src/flooritem.cpp        | 5 ++++-
 src/gui/setup_colors.cpp | 2 ++
 src/gui/userpalette.cpp  | 5 +++++
 src/gui/userpalette.h    | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index 10a3f3c94..2c02179dd 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -29,6 +29,7 @@
 
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
+#include "gui/userpalette.h"
 
 #include "resources/iteminfo.h"
 
@@ -142,7 +143,9 @@ bool FloorItem::draw(Graphics *const graphics,
     {
         if (font && mAmount > 1)
         {
-            graphics->setColor(gcn::Color(255, 255, 255, 100));
+//            graphics->setColor(gcn::Color(255, 255, 255, 100));
+            graphics->setColor(userPalette->getColor(
+                UserPalette::FLOOR_ITEM_TEXT));
             font->drawString(graphics, toString(mAmount), x, y);
         }
     }
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index ec0a74cec..62dba3038 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -300,6 +300,7 @@ void Setup_Colors::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
         case UserPalette::HIT_LOCAL_PLAYER_MISS:
         case UserPalette::ATTACK_RANGE:
         case UserPalette::MONSTER_ATTACK_RANGE:
+        case UserPalette::FLOOR_ITEM_TEXT:
             mTextPreview->setShadow(false);
             break;
         default:
@@ -324,6 +325,7 @@ void Setup_Colors::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
         case UserPalette::MONSTER_HP2:
         case UserPalette::PLAYER_HP:
         case UserPalette::PLAYER_HP2:
+        case UserPalette::FLOOR_ITEM_TEXT:
             // TRANSLATORS: colors tab. label.
             mGradDelayLabel->setCaption(_("Alpha:"));
             mGradDelayText->setRange(0, 255);
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index 4491b63d2..b6a34973d 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -72,6 +72,7 @@ const std::string ColorTypeNames[] =
     "ColorAttackRange",
     "ColorAttackRangeBorder",
     "ColorMonsterAttackRange",
+    "ColorFloorItemText",
     "ColorHomePlace",
     "ColorHomePlaceBorder",
     "ColorRoadPoint"
@@ -201,6 +202,10 @@ UserPalette::UserPalette():
     addColor(MONSTER_ATTACK_RANGE, 0xff0000, STATIC,
         // TRANSLATORS: palette color
         _("Monster Attack Range"), 20);
+
+    addColor(FLOOR_ITEM_TEXT, 0xffffff, STATIC,
+        // TRANSLATORS: palette color
+        _("Floor item amount color"), 100);
     addColor(HOME_PLACE, 0xffffff, STATIC,
         // TRANSLATORS: palette color
         _("Home Place"), 20);
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h
index 21bc84e6c..5446077a2 100644
--- a/src/gui/userpalette.h
+++ b/src/gui/userpalette.h
@@ -73,6 +73,7 @@ class UserPalette final : public Palette, public gcn::ListModel
             ATTACK_RANGE,
             ATTACK_RANGE_BORDER,
             MONSTER_ATTACK_RANGE,
+            FLOOR_ITEM_TEXT,
             HOME_PLACE,
             HOME_PLACE_BORDER,
             ROAD_POINT,
-- 
cgit v1.2.3-60-g2f50