Core/Misc: Another batch of fixes for issues found by static analysis

This commit is contained in:
Spp committed 2013-05-30 13:18:29 +02:00
1 parent 782ea4309a
commit 9664c0ab5c
14 files changed
+130 -96

No files matched your search

+2 -1
View File
@@ -338,7 +338,8 @@ public:
}
else
sWorld->ShutdownServ(time, SHUTDOWN_MASK_IDLE, SHUTDOWN_EXIT_CODE);
return true;
return true;
}
// Exit the realm
@@ -716,27 +716,27 @@ public:
if (CheckTimer <= diff)
{
Creature* Kalec = Unit::GetCreature(*me, KalecGUID);
if (!Kalec || (Kalec && !Kalec->isAlive()))
if (!Kalec || !Kalec->isAlive())
{
if (Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID))
Kalecgos->AI()->EnterEvadeMode();
return;
return;
}
if (HealthBelowPct(10) && !isEnraged)
{
if (Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID))
Kalecgos->AI()->DoAction(DO_ENRAGE);
DoAction(DO_ENRAGE);
}
Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID);
if (Kalecgos)
if (Kalecgos && !Kalecgos->isInCombat())
{
if (!Kalecgos->isInCombat())
{
me->AI()->EnterEvadeMode();
return;
}
me->AI()->EnterEvadeMode();
return;
}
if (!isBanished && HealthBelowPct(1))
{
if (Kalecgos)
@@ -746,8 +746,7 @@ public:
me->DealDamage(me, me->GetHealth());
return;
}
else
DoAction(DO_BANISH);
DoAction(DO_BANISH);
}
else
{