From 9dfaa0289539b26318584486be387150519040c4 Mon Sep 17 00:00:00 2001
From: maximius <none@none>
Date: Sat, 26 Sep 2009 12:54:12 -0700
Subject: *Remove some redundant code, and relocate some illogical code.

--HG--
branch : trunk
---
 src/game/Creature.cpp      | 2 +-
 src/trinitycore/Master.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index f2b7669c59e..a7e5153e255 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -2007,7 +2007,7 @@ bool Creature::IsVisibleInGridForPlayer(Player const* pl) const
     // Live player (or with not release body see live creatures or death creatures with corpse disappearing time > 0
     if(pl->isAlive() || pl->GetDeathTimer() > 0)
     {
-        if( GetEntry() == VISUAL_WAYPOINT && !pl->isGameMaster() )
+        if( GetEntry() == VISUAL_WAYPOINT )
             return false;
         return (isAlive() || m_deathTimer > 0 || (m_isDeadByDefault && m_deathState==CORPSE));
     }
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp
index c50381d7a2d..fee1b9be71c 100644
--- a/src/trinitycore/Master.cpp
+++ b/src/trinitycore/Master.cpp
@@ -521,10 +521,10 @@ void Master::_OnSignal(int s)
             break;
         case SIGTERM:
         #ifdef _WIN32
-        if (m_ServiceStatus != 1)
            case SIGBREAK:
         #endif
-            World::StopNow(SHUTDOWN_EXIT_CODE);
+            if (m_ServiceStatus != 1)
+                World::StopNow(SHUTDOWN_EXIT_CODE);
             break;
     }
 
-- 
cgit v1.2.3