Fix minimap zoom, blue name

modules/game_minimap/minimap.otui

@@ -21,12 +21,12 @@ FloorUpControl < MapControl
 FloorDownControl < MapControl
   icon-source: /images/game/minimap/floor_down
 
-ZoomOutControl < MapControl
-  //image-source: /images/game/minimap/zoom_out
-
 ZoomInControl < MapControl
   //image-source: /images/game/minimap/zoom_in
 
+ZoomOutControl < MapControl
+  //image-source: /images/game/minimap/zoom_out
+
 MiniWindow
   id: minimapWindow
   !text: tr('Minimap')
@@ -75,7 +75,7 @@ MiniWindow
       enabled: true
       @onClick: onButtonClick(self:getId())
 
-    ZoomOutControl
+    ZoomInControl
       id: zoomIn
       text: +
       font: terminus-14px-bold
@@ -86,7 +86,7 @@ MiniWindow
       enabled: true
       @onClick: onButtonClick(self:getId())
 
-    ZoomInControl
+    ZoomOutControl
       id: zoomOut
       text: -
       anchors.right: parent.right

src/client/creature.cpp

@@ -263,7 +263,6 @@ void Creature::drawInformation(const Point& point, bool useGray, const Rect& par
     else
         g_painter->setColor(fillColor);
 
-    g_painter->setColor(fillColor);
     g_painter->drawFilledRect(healthRect);
 
     m_nameCache.draw(textRect);

src/client/uiminimap.h

@@ -33,8 +33,8 @@ public:
 
     void drawSelf(Fw::DrawPane drawPane);
 
-    bool zoomIn() { return setZoom(m_zoom-1); }
+    bool zoomIn() { return setZoom(m_zoom+1); }
-    bool zoomOut() { return setZoom(m_zoom+1); }
+    bool zoomOut() { return setZoom(m_zoom-1); }
 
     bool setZoom(int zoom);
     void setMinZoom(int minZoom) { m_minZoom = minZoom; }