diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-01-11 01:34:11 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-01-11 01:34:11 +0200 |
| commit | fcced13d9972ac70f0f01f19583b7868e255b6a7 (patch) | |
| tree | 9b01df102c5f9ba032ea0f9bc413dd707e99d88b /src/gui/userpalette.cpp | |
| parent | 311783bebbe2bed366dca5097697ce34c690292d (diff) | |
| parent | ef1b9856c86512fe73154c17da3ea98a7cd5f896 (diff) | |
| download | manaverse-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.gz manaverse-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.bz2 manaverse-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.xz manaverse-fcced13d9972ac70f0f01f19583b7868e255b6a7.zip | |
Merge branch 'master' into invfiler
Diffstat (limited to 'src/gui/userpalette.cpp')
| -rw-r--r-- | src/gui/userpalette.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index 03e5c1eed..46f1b72b3 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -52,6 +52,8 @@ const std::string ColorTypeNames[] = "ColorParticle", "ColorPickupInfo", "ColorExpInfo", + "ColorPlayerHp", + "ColorPlayerHp2", "ColorHitPlayerMonster", "ColorHitMonsterPlayer", "ColorHitPlayerPlayer", @@ -124,6 +126,9 @@ UserPalette::UserPalette(): addColor(PARTICLE, 0xffffff, STATIC, _("Particle Effects")); addColor(PICKUP_INFO, 0x28dc28, STATIC, _("Pickup Notification")); addColor(EXP_INFO, 0xffff00, STATIC, _("Exp Notification")); + addColor(PLAYER_HP, 0x00ff00, STATIC, _("Player HP bar"), 50); + addColor(PLAYER_HP2, 0xff0000, STATIC, + _("Player HP bar (second color)"), 50); addColor(HIT_PLAYER_MONSTER, 0x0064ff, STATIC, _("Player Hits Monster")); addColor(HIT_MONSTER_PLAYER, 0xff3232, STATIC, _("Monster Hits Player")); addColor(HIT_PLAYER_PLAYER, 0xff5050, STATIC, |