Add mercenary minimap color.

3 files changed, 9 insertions, 2 deletions

diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index d6135bd00..e581ad1a0 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -74,7 +74,8 @@ const std::string ColorTypeNames[] =
     "ColorHomePlaceBorder",
     "ColorRoadPoint",
     "ColorNet",
-    "ColorPet"
+    "ColorPet",
+    "ColorMercenary"
 };
 
 std::string UserPalette::getConfigName(const std::string &typeName)
@@ -217,6 +218,8 @@ UserPalette::UserPalette() :
         _("Tiles border"), 64);
     // TRANSLATORS: palette color
     addColor(PET, 0xffffff, STATIC, _("Pets"));
+    // TRANSLATORS: palette color
+    addColor(MERCENARY, 0xffffff, STATIC, _("Mercenary"));
     commit(true);
 }
 
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h
index f5cc07617..6bb20c837 100644
--- a/src/gui/userpalette.h
+++ b/src/gui/userpalette.h
@@ -79,6 +79,7 @@ class UserPalette final : public Palette, public ListModel
             ROAD_POINT,
             NET,
             PET,
+            MERCENARY,
             USER_COLOR_LAST
         };
 
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 19f6241e8..9b5ce52dd 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -336,11 +336,14 @@ void Minimap::draw(Graphics *graphics)
                     type = UserPalette::PET;
                     break;
 
+                case ActorType::Mercenary:
+                    type = UserPalette::MERCENARY;
+                    break;
+
                 case ActorType::Avatar:
                 case ActorType::Unknown:
                 case ActorType::Player:
                 case ActorType::FloorItem:
-                case ActorType::Mercenary:
                 case ActorType::Homunculus:
                 default:
                     continue;