diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-09-28 12:24:17 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-09-28 12:24:17 +0300 |
commit | 18b52b14b247f693827accf8914a1052fee1cf8d (patch) | |
tree | 8ceb7736b9234df1eba5d1b5160fd9b3f2f52674 | |
parent | 972d2c8c815d8b8f7bd8648d8480b9461c435ea1 (diff) | |
download | manaverse-18b52b14b247f693827accf8914a1052fee1cf8d.tar.gz manaverse-18b52b14b247f693827accf8914a1052fee1cf8d.tar.bz2 manaverse-18b52b14b247f693827accf8914a1052fee1cf8d.tar.xz manaverse-18b52b14b247f693827accf8914a1052fee1cf8d.zip |
Add pets minimap color.
-rw-r--r-- | src/gui/userpalette.cpp | 5 | ||||
-rw-r--r-- | src/gui/userpalette.h | 1 | ||||
-rw-r--r-- | src/gui/windows/minimap.cpp | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index 04b1c15d4..d6135bd00 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -73,7 +73,8 @@ const std::string ColorTypeNames[] = "ColorHomePlace", "ColorHomePlaceBorder", "ColorRoadPoint", - "ColorNet" + "ColorNet", + "ColorPet" }; std::string UserPalette::getConfigName(const std::string &typeName) @@ -214,6 +215,8 @@ UserPalette::UserPalette() : addColor(NET, 0x000000, STATIC, // TRANSLATORS: palette color _("Tiles border"), 64); + // TRANSLATORS: palette color + addColor(PET, 0xffffff, STATIC, _("Pets")); commit(true); } diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h index b155ee5c9..f5cc07617 100644 --- a/src/gui/userpalette.h +++ b/src/gui/userpalette.h @@ -78,6 +78,7 @@ class UserPalette final : public Palette, public ListModel HOME_PLACE_BORDER, ROAD_POINT, NET, + PET, USER_COLOR_LAST }; diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 760020ca5..19f6241e8 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -331,12 +331,15 @@ void Minimap::draw(Graphics *graphics) type = UserPalette::PORTAL_HIGHLIGHT; break; + case ActorType::LocalPet: + case ActorType::Pet: + type = UserPalette::PET; + break; + case ActorType::Avatar: case ActorType::Unknown: case ActorType::Player: case ActorType::FloorItem: - case ActorType::LocalPet: - case ActorType::Pet: case ActorType::Mercenary: case ActorType::Homunculus: default: |