diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-16 12:19:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-06-16 12:19:14 +0300 |
| commit | e9f59c64a46ad38fb47aac6313c869eaa02ed0e3 (patch) | |
| tree | 4e524de66b91f2dba8fb53d00eb22981b8e73f95 | |
| parent | de5b0753bd94e014f0e81fc676b21c251aabd326 (diff) | |
| download | manaverse-e9f59c64a46ad38fb47aac6313c869eaa02ed0e3.tar.gz manaverse-e9f59c64a46ad38fb47aac6313c869eaa02ed0e3.tar.bz2 manaverse-e9f59c64a46ad38fb47aac6313c869eaa02ed0e3.tar.xz manaverse-e9f59c64a46ad38fb47aac6313c869eaa02ed0e3.zip | |
Add enemy color.
Use enemy color in hightlight nick what hit player.
| -rw-r--r-- | src/being/being.cpp | 2 | ||||
| -rw-r--r-- | src/enums/gui/usercolorid.h | 1 | ||||
| -rw-r--r-- | src/gui/userpalette.cpp | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index bf17a2a23..c15c80df3 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -2084,7 +2084,7 @@ void Being::updateColors() } else if (mEnemy) { - mNameColor = &userPalette->getColor(UserColorId::MONSTER); + mNameColor = &userPalette->getColor(UserColorId::ENEMY); } else if (mParty && localPlayer && mParty == localPlayer->getParty()) diff --git a/src/enums/gui/usercolorid.h b/src/enums/gui/usercolorid.h index 5087c36f8..675bec7fa 100644 --- a/src/enums/gui/usercolorid.h +++ b/src/enums/gui/usercolorid.h @@ -34,6 +34,7 @@ enumStart(UserColorId) DISREGARDED, IGNORED, ERASED, + ENEMY, PC, SELF, GM, diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index 8ae5cb8b0..7fe8074b0 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -38,6 +38,7 @@ const std::string ColorTypeNames[] = "ColorDisregarded", "ColorIgnored", "ColorErased", + "ColorEnemy", "ColorPlayer", "ColorSelf", "ColorGM", @@ -184,6 +185,11 @@ UserPalette::UserPalette() : // TRANSLATORS: palette color GradientType::STATIC, _("Guild members")); + addColor(UserColorId::ENEMY, + 0xff4040, + GradientType::STATIC, + // TRANSLATORS: palette color + _("Enemy")); addColor(UserColorId::PARTICLE, 0xffffff, // TRANSLATORS: palette color |