summaryrefslogtreecommitdiff
path: root/src/gui/itempopup.cpp
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2009-03-13 01:16:21 -0600
committerIra Rice <irarice@gmail.com>2009-03-13 01:16:21 -0600
commit90e29d12a044030c140382c038c4b01e722113e7 (patch)
treef5b19307bb6e15738ce4c37face98675b7b649c9 /src/gui/itempopup.cpp
parent011133ef09dd4340c7649100cea170e2595b6b2f (diff)
downloadmana-client-90e29d12a044030c140382c038c4b01e722113e7.tar.gz
mana-client-90e29d12a044030c140382c038c4b01e722113e7.tar.bz2
mana-client-90e29d12a044030c140382c038c4b01e722113e7.tar.xz
mana-client-90e29d12a044030c140382c038c4b01e722113e7.zip
Added item types to the palette class.
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/gui/itempopup.cpp')
-rw-r--r--src/gui/itempopup.cpp27
1 files changed, 14 insertions, 13 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;
}