From 5a9759680427154f379499cb3268f307bb860c22 Mon Sep 17 00:00:00 2001
From: Chuck Miller <shadowmil@gmail.com>
Date: Tue, 5 May 2009 17:49:40 -0400
Subject: Fixed hidding showing player names

---
 src/player.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'src/player.cpp')

diff --git a/src/player.cpp b/src/player.cpp
index 594b3680..14a9c97f 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "animatedsprite.h"
+#include "configuration.h"
 #include "game.h"
 #ifdef TMWSERV_SUPPORT
 #include "guild.h"
@@ -74,8 +75,8 @@ void Player::setName(const std::string &name)
                                   &guiPalette->getColor(Palette::SELF) :
                                   &guiPalette->getColor(Palette::PC));
         }
-        Being::setName(name);
     }
+    Being::setName(name);
 }
 
 #ifdef EATHENA_SUPPORT
@@ -134,6 +135,18 @@ void Player::logic()
             break;
     }
 
+    if (getType() == Being::PLAYER && player_node != this)
+    {
+        if (!config.getValue("visiblenames", 1) && mName)
+        {
+            delete mName;
+            mName = NULL;
+        }
+        else if (config.getValue("visiblenames", 1) && !mName && !(getName().empty()))
+        {
+            setName(getName());
+        }
+    }
     Being::logic();
 }
 #endif
-- 
cgit v1.2.3-60-g2f50