*Remove some redundant code, and relocate some illogical code.

--HG--
branch : trunk
This commit is contained in:
maximius
2009-09-26 12:54:12 -07:00
parent 3416a6543d
commit 9dfaa02895
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -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));
}
+2 -2
View File
@@ -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;
}