diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-16 16:21:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-06-16 16:21:03 +0300 |
| commit | 93a94dba623aa1f04107d23c96082ba9e2990469 (patch) | |
| tree | a300236c56ac0f91f0b9475bd9d75161acde0254 /src | |
| parent | 9403fde6fc94e5d7047f5bf0b5a006490ef4cd09 (diff) | |
| download | mv-93a94dba623aa1f04107d23c96082ba9e2990469.tar.gz mv-93a94dba623aa1f04107d23c96082ba9e2990469.tar.bz2 mv-93a94dba623aa1f04107d23c96082ba9e2990469.tar.xz mv-93a94dba623aa1f04107d23c96082ba9e2990469.zip | |
Add 3 team colors.
Diffstat (limited to 'src')
| -rw-r--r-- | src/enums/gui/usercolorid.h | 3 | ||||
| -rw-r--r-- | src/gui/userpalette.cpp | 24 |
2 files changed, 24 insertions, 3 deletions
diff --git a/src/enums/gui/usercolorid.h b/src/enums/gui/usercolorid.h index 991e7e86b..5ecd64458 100644 --- a/src/enums/gui/usercolorid.h +++ b/src/enums/gui/usercolorid.h @@ -46,6 +46,9 @@ enumStart(UserColorId) HOMUNCULUS, PARTY, GUILD, + TEAM1, + TEAM2, + TEAM3, LABEL_PARTICLES, PARTICLE, PICKUP_INFO, diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index 3c11088c3..c79cc0b19 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -51,6 +51,9 @@ const std::string ColorTypeNames[static_cast<size_t>( "ColorHomunculus", "ColorParty", "ColorGuild", + "ColorTeam1", + "ColorTeam2", + "ColorTeam3", "", "ColorParticle", "ColorPickupInfo", @@ -149,6 +152,11 @@ UserPalette::UserPalette() : GradientType::STATIC, // TRANSLATORS: palette color _("Erased names")); + addColor(UserColorId::ENEMY, + 0xff4040, + GradientType::STATIC, + // TRANSLATORS: palette color + _("Enemy")); addColor(UserColorId::PC, 0xffffff, GradientType::STATIC, @@ -199,11 +207,21 @@ UserPalette::UserPalette() : // TRANSLATORS: palette color GradientType::STATIC, _("Guild members")); - addColor(UserColorId::ENEMY, - 0xff4040, + addColor(UserColorId::TEAM1, + 0x0000ff, + // TRANSLATORS: palette color GradientType::STATIC, + strprintf(_("Team %d"), 1)); + addColor(UserColorId::TEAM2, + 0x00a020, // TRANSLATORS: palette color - _("Enemy")); + GradientType::STATIC, + strprintf(_("Team %d"), 2)); + addColor(UserColorId::TEAM3, + 0xffff20, + // TRANSLATORS: palette color + GradientType::STATIC, + strprintf(_("Team %d"), 3)); addLabel(UserColorId::LABEL_PARTICLES, // TRANSLATORS: palette label _("Particles")); |