diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-03-04 22:41:19 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-03-12 14:49:27 -0700 |
| commit | 781b3c9f17708cc5fe08eb3c9ee38d596364d97c (patch) | |
| tree | 833797c9b9168ab58864ffe4cf8ed028060e44a2 /src/gui/minimap.cpp | |
| parent | 96b64757954f07d196599b3c1131a6603982c930 (diff) | |
| download | mana-781b3c9f17708cc5fe08eb3c9ee38d596364d97c.tar.gz mana-781b3c9f17708cc5fe08eb3c9ee38d596364d97c.tar.bz2 mana-781b3c9f17708cc5fe08eb3c9ee38d596364d97c.tar.xz mana-781b3c9f17708cc5fe08eb3c9ee38d596364d97c.zip | |
Split Palette into Theme and UserPalette
Themes can now control the colors they use. Colors in the Viewport (being
names, particles, etc) can still be changed by the user. Also make
ProgressBars more easily colored. DyePalette was made more flexible in the
process.
Also fixes comparing strings of different lengths insensitively.
Reviewed-by: Thorbjørn Lindeijer
Diffstat (limited to 'src/gui/minimap.cpp')
| -rw-r--r-- | src/gui/minimap.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index 8e5585ad..53d58d2e 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -30,8 +30,8 @@ #include "map.h" #include "player.h" -#include "gui/palette.h" #include "gui/setup.h" +#include "gui/userpalette.h" #include "resources/image.h" #include "resources/resourcemanager.h" @@ -201,32 +201,32 @@ void Minimap::draw(gcn::Graphics *graphics) { const Player *player = static_cast<const Player*>(being); - Palette::ColorType type = Palette::PC; + int type = UserPalette::PC; if (being == player_node) { - type = Palette::SELF; + type = UserPalette::SELF; dotSize = 3; } else if (player->isGM()) { - type = Palette::GM_NAME; + type = UserPalette::GM; } else if (player->isInParty()) { - type = Palette::PARTY; + type = UserPalette::PARTY; } - graphics->setColor(guiPalette->getColor(type)); + graphics->setColor(userPalette->getColor(type)); break; } case Being::MONSTER: - graphics->setColor(guiPalette->getColor(Palette::MONSTER)); + graphics->setColor(userPalette->getColor(UserPalette::MONSTER)); break; case Being::NPC: - graphics->setColor(guiPalette->getColor(Palette::NPC)); + graphics->setColor(userPalette->getColor(UserPalette::NPC)); break; default: |