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/localplayer.h | |
| 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/localplayer.h')
| -rw-r--r-- | src/localplayer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/localplayer.h b/src/localplayer.h index 69fd4d0f..dce83ccd 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -24,7 +24,7 @@ #include "player.h" -#include "gui/palette.h" +#include "gui/userpalette.h" #include <memory> #include <vector> @@ -349,7 +349,7 @@ class LocalPlayer : public Player { return mPathSetByMouse; } void addMessageToQueue(const std::string &message, - Palette::ColorType color = Palette::EXP_INFO); + int color = UserPalette::EXP_INFO); /** * Called when a option (set with config.addListener()) is changed @@ -472,7 +472,7 @@ class LocalPlayer : public Player /** Animated target cursors. */ SimpleAnimation *mTargetCursor[2][NUM_TC]; - typedef std::pair<std::string, Palette::ColorType> MessagePair; + typedef std::pair<std::string, int> MessagePair; /** Queued exp messages*/ std::list<MessagePair> mMessages; int mMessageTime; |