Added item types to the palette class.

Signed-off-by: Ira Rice <irarice@gmail.com>

4 files changed, 64 insertions, 19 deletions

diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index ebbc6af3..b3002290 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -27,6 +27,7 @@
 
 #include "gui.h"
 #include "itempopup.h"
+#include "palette.h"
 #include "scrollarea.h"
 #include "textbox.h"
 
@@ -166,31 +167,31 @@ gcn::Color ItemPopup::getColor(const std::string& type)
     gcn::Color color;
 
     if (type.compare("generic") == 0)
-        color = 0x21a5b1;
+        color = guiPalette->getColor(Palette::GENERIC);
     else if (type.compare("equip-head") == 0)
-        color = 0x527fa4;
+        color = guiPalette->getColor(Palette::HEAD);
     else if (type.compare("usable") == 0)
-        color = 0x268d24;
+        color = guiPalette->getColor(Palette::USABLE);
     else if (type.compare("equip-torso") == 0)
-        color = 0xd12aa4;
+        color = guiPalette->getColor(Palette::TORSO);
     else if (type.compare("equip-1hand") == 0)
-        color = 0xf42a2a;
+        color = guiPalette->getColor(Palette::ONEHAND);
     else if (type.compare("equip-legs") == 0)
-        color = 0x699900;
+        color = guiPalette->getColor(Palette::LEGS);
     else if (type.compare("equip-feet") == 0)
-        color = 0xaa1d48;
+        color = guiPalette->getColor(Palette::FEET);
     else if (type.compare("equip-2hand") == 0)
-        color = 0xf46d0e;
+        color = guiPalette->getColor(Palette::TWOHAND);
     else if (type.compare("equip-shield") == 0)
-        color = 0x9c2424;
+        color = guiPalette->getColor(Palette::SHIELD);
     else if (type.compare("equip-ring") == 0)
-        color = 0x0000ff;
+        color = guiPalette->getColor(Palette::RING);
     else if (type.compare("equip-arms") == 0)
-        color = 0x9c24e8;
+        color = guiPalette->getColor(Palette::ARMS);
     else if (type.compare("equip-ammo") == 0)
-        color = 0x8b6311;
+        color = guiPalette->getColor(Palette::AMMO);
     else
-        color = 0x000000;
+        color = guiPalette->getColor(Palette::UNKNOWN_ITEM);
 
     return color;
 }
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index a79f2050..80b5f1f1 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -101,12 +101,26 @@ Palette::Palette() :
     addColor(LOGGER, 0x919191, STATIC, indent + _("Logger"), 'L');
     addColor(HYPERLINK, 0xe50d0d, STATIC, indent + _("Hyperlink"), '<');
 
-    addColor(BEING, 0xffffff, STATIC, _("Being"), 0);
-    addColor(PC, 0xffffff, STATIC, indent + _("Other Player's Names"), 0);
-    addColor(SELF, 0xff8040, STATIC, indent + _("Own Name"), 0);
-    addColor(GM_NAME, 0x00ff00, STATIC, indent + _("GM Names"), 0);
-    addColor(NPC, 0xc8c8ff, STATIC, indent + _("NPCs"), 0);
-    addColor(MONSTER, 0xff4040, STATIC, indent + _("Monsters"), 0);
+    addColor(BEING, 0xffffff, STATIC, _("Being"));
+    addColor(PC, 0xffffff, STATIC, indent + _("Other Player's Names"));
+    addColor(SELF, 0xff8040, STATIC, indent + _("Own Name"));
+    addColor(GM_NAME, 0x00ff00, STATIC, indent + _("GM Names"));
+    addColor(NPC, 0xc8c8ff, STATIC, indent + _("NPCs"));
+    addColor(MONSTER, 0xff4040, STATIC, indent + _("Monsters"));
+
+    addColor(UNKNOWN_ITEM, 0x000000, STATIC, _("Unknown Item Type"));
+    addColor(GENERIC, 0x21a5b1, STATIC, indent + _("Generic"));
+    addColor(HEAD, 0x527fa4, STATIC, indent + _("Hat"));
+    addColor(USABLE, 0x268d24, STATIC, indent + _("Usable"));
+    addColor(TORSO, 0xd12aa4, STATIC, indent + _("Shirt"));
+    addColor(ONEHAND, 0xf42a2a, STATIC, indent + _("1 Handed Weapons"));
+    addColor(LEGS, 0x699900, STATIC, indent + _("Pants"));
+    addColor(FEET, 0xaa1d48, STATIC, indent + _("Shoes"));
+    addColor(TWOHAND, 0xf46d0e, STATIC, indent + _("2 Handed Weapons"));
+    addColor(SHIELD, 0x9c2424, STATIC, indent + _("Shield"));
+    addColor(RING, 0x0000ff, STATIC, indent + _("Ring"));
+    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"),
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 02489686..a91d3605 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -69,6 +69,19 @@ class Palette : public gcn::ListModel
             ENTRY(GM_NAME)\
             ENTRY(NPC)\
             ENTRY(MONSTER)\
+            ENTRY(UNKNOWN_ITEM)\
+            ENTRY(GENERIC)\
+            ENTRY(HEAD)\
+            ENTRY(USABLE)\
+            ENTRY(TORSO)\
+            ENTRY(ONEHAND)\
+            ENTRY(LEGS)\
+            ENTRY(FEET)\
+            ENTRY(TWOHAND)\
+            ENTRY(SHIELD)\
+            ENTRY(RING)\
+            ENTRY(ARMS)\
+            ENTRY(AMMO)\
             ENTRY(PARTICLE)\
             ENTRY(EXP_INFO)\
             ENTRY(PICKUP_INFO)\
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 038b21c6..0dfaf7a6 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -225,6 +225,22 @@ void Setup_Colors::action(const gcn::ActionEvent &event)
                 }
                 mPreview->addRow(msg);
                 break;
+            case Palette::UNKNOWN_ITEM:
+            case Palette::GENERIC:
+            case Palette::HEAD:
+            case Palette::USABLE:
+            case Palette::TORSO:
+            case Palette::ONEHAND:
+            case Palette::LEGS:
+            case Palette::FEET:
+            case Palette::TWOHAND:
+            case Palette::SHIELD:
+            case Palette::RING:
+            case Palette::ARMS:
+            case Palette::AMMO:
+                mTextPreview->setFont(boldFont);
+                mTextPreview->setOutline(false);
+                mTextPreview->setShadow(false);
             case Palette::PARTICLE:
             case Palette::EXP_INFO:
             case Palette::PICKUP_INFO:
@@ -241,6 +257,7 @@ void Setup_Colors::action(const gcn::ActionEvent &event)
             case Palette::MONSTER:
                 mTextPreview->setFont(boldFont);
                 mTextPreview->setTextColor(col);
+            case Palette::TYPE_COUNT:
                 break;
         }