Handle in party status in a much saner way

1 files changed, 7 insertions, 5 deletions

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 17a7e82a..160c0722 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -31,7 +31,6 @@
 #include "player.h"
 
 #include "gui/palette.h"
-#include "gui/partywindow.h"
 
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
@@ -182,6 +181,8 @@ void Minimap::draw(gcn::Graphics *graphics)
         {
             case Being::PLAYER:
                 {
+                    const Player* player = static_cast<const Player*>(being);
+
                     Palette::ColorType type = Palette::PC;
 
                     if (being == player_node)
@@ -189,14 +190,15 @@ void Minimap::draw(gcn::Graphics *graphics)
                         type = Palette::SELF;
                         dotSize = 3;
                     }
-                    else if (partyWindow->findMember(being->getId()))
+                    else if (player->isGM())
+                    {
+                        type = Palette::GM_NAME;
+                    }
+                    else if (player->isInParty())
                     {
                         type = Palette::PARTY;
                     }
 
-                    if (static_cast<const Player*>(being)->isGM())
-                        type = Palette::GM_NAME;
-
                     graphics->setColor(guiPalette->getColor(type));
                     break;
                  }