summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2010-10-16 23:22:55 +0300
committerAndrei Karas <akaras@inbox.ru>2010-10-17 00:25:50 +0300
commit58f04040cea0c7eb64388925dcdf8de848dd47c2 (patch)
treec8133d56ac1a7e4b5a5d92712112be8c225c0e32 /src/gui
parentcbb79bd12979ea8458e934f4ce890660473e3865 (diff)
downloadmana-client-58f04040cea0c7eb64388925dcdf8de848dd47c2.tar.gz
mana-client-58f04040cea0c7eb64388925dcdf8de848dd47c2.tar.bz2
mana-client-58f04040cea0c7eb64388925dcdf8de848dd47c2.tar.xz
mana-client-58f04040cea0c7eb64388925dcdf8de848dd47c2.zip
Add new three colors.
Add colors: Local Player Hits Monster Local Player Critical Hit Local Player Miss Reviewed-by: cody
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/userpalette.cpp12
-rw-r--r--src/gui/userpalette.h3
2 files changed, 14 insertions, 1 deletions
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index e5726ada..9e202fe9 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -47,6 +47,9 @@ const std::string ColorTypeNames[] = {
"ColorHitPlayerMonster",
"ColorHitMonsterPlayer",
"ColorHitCritical",
+ "ColorHitLocalPlayerMonster",
+ "ColorHitLocalPlayerCritical",
+ "ColorHitLocalPlayerMiss",
"ColorMiss"
};
@@ -96,9 +99,16 @@ UserPalette::UserPalette():
addColor(PARTICLE, 0xffffff, STATIC, _("Particle Effects"));
addColor(PICKUP_INFO, 0x28dc28, STATIC, _("Pickup Notification"));
addColor(EXP_INFO, 0xffff00, STATIC, _("Exp Notification"));
- addColor(HIT_PLAYER_MONSTER, 0x0064ff, STATIC, _("Player Hits Monster"));
+ addColor(HIT_PLAYER_MONSTER, 0x0064ff, STATIC,
+ _("Other Player Hits Monster"));
addColor(HIT_MONSTER_PLAYER, 0xff3232, STATIC, _("Monster Hits Player"));
addColor(HIT_CRITICAL, 0xff0000, RAINBOW, _("Critical Hit"));
+ addColor(HIT_LOCAL_PLAYER_MONSTER, 0x00ff00, STATIC,
+ _("Local Player Hits Monster"));
+ addColor(HIT_LOCAL_PLAYER_CRITICAL, 0xff0000, RAINBOW,
+ _("Local Player Critical Hit"));
+ addColor(HIT_LOCAL_PLAYER_MISS, 0x00ffa6, STATIC,
+ _("Local Player Miss"));
addColor(MISS, 0xffff00, STATIC, _("Misses"));
commit(true);
}
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h
index 82bcea1c..be02db10 100644
--- a/src/gui/userpalette.h
+++ b/src/gui/userpalette.h
@@ -49,6 +49,9 @@ class UserPalette : public Palette, public gcn::ListModel
HIT_PLAYER_MONSTER,
HIT_MONSTER_PLAYER,
HIT_CRITICAL,
+ HIT_LOCAL_PLAYER_MONSTER,
+ HIT_LOCAL_PLAYER_CRITICAL,
+ HIT_LOCAL_PLAYER_MISS,
MISS,
USER_COLOR_LAST
};