diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-30 07:19:36 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-30 07:19:36 -0600 |
| commit | 2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a (patch) | |
| tree | 49fb5a1e363584800f967a4a163fb3e746228722 /src/gui/palette.cpp | |
| parent | bbf4d657e77fd39887b9941af1fe75a5ec27d988 (diff) | |
| download | mana-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.tar.gz mana-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.tar.bz2 mana-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.tar.xz mana-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.zip | |
Merge item types to remove more #ifdefs
Diffstat (limited to 'src/gui/palette.cpp')
| -rw-r--r-- | src/gui/palette.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp index b176fcff..f226d512 100644 --- a/src/gui/palette.cpp +++ b/src/gui/palette.cpp @@ -20,16 +20,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <math.h> - #include "palette.h" -#include "gui.h" -#include "../configuration.h" -#include "../game.h" +#include "configuration.h" +#include "game.h" + +#include "gui/gui.h" -#include "../utils/gettext.h" -#include "../utils/stringutils.h" +#include "utils/gettext.h" +#include "utils/stringutils.h" + +#include <math.h> const gcn::Color Palette::BLACK = gcn::Color(0, 0, 0); @@ -119,6 +120,7 @@ Palette::Palette() : addColor(TWOHAND, 0xf46d0e, STATIC, indent + _("2 Handed Weapons")); addColor(SHIELD, 0x9c2424, STATIC, indent + _("Shield")); addColor(RING, 0x0000ff, STATIC, indent + _("Ring")); + addColor(NECKLACE, 0xff00ff, STATIC, indent + _("Necklace")); addColor(ARMS, 0x9c24e8, STATIC, indent + _("Arms")); addColor(AMMO, 0x8b6311, STATIC, indent + _("Ammo")); |