diff options
| author | maximius <none@none> | 2009-09-26 12:54:12 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-09-26 12:54:12 -0700 |
| commit | 9dfaa0289539b26318584486be387150519040c4 (patch) | |
| tree | 4eff09ad92bc7593e38508030ca97c6bf860a6b9 /src | |
| parent | 3416a6543d996aa0dda1f9cb5f9d4e4570a7fbb6 (diff) | |
*Remove some redundant code, and relocate some illogical code.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Creature.cpp | 2 | ||||
| -rw-r--r-- | src/trinitycore/Master.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
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; } |