fix(Core/Misc): all GCC warnings (#3457)

This commit is contained in:
Francesco Borzì
2020-09-14 17:31:12 +02:00
committed by GitHub
parent 80b149b218
commit b61ae8abcd
34 changed files with 157 additions and 75 deletions

View File

@@ -523,7 +523,9 @@ public:
break;
case ACTION_STOP_LK_FIGHT:
if (!IsDuringLKFight)
{
break;
}
instance->LoadGrid(LeaderEscapePos.GetPositionX(), LeaderEscapePos.GetPositionY());
if (Creature* c = instance->GetCreature(NPC_LeaderGUID))
{
@@ -568,7 +570,7 @@ public:
IsDuringLKFight = false;
outroTimer = 0;
outroStep = 0;
// no break intended
[[fallthrough]];
case ACTION_DELETE_ICE_WALL:
HandleGameObject(GO_IceWallGUID, true);
GO_IceWallGUID = 0;

View File

@@ -130,11 +130,11 @@ public:
n2->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY1H);
}
// TODO This spell check is invalid
if (SPELL_NECROLYTE_CHANNELING)
{
// if (SPELL_NECROLYTE_CHANNELING)
// {
n1->RemoveAura(SPELL_NECROLYTE_CHANNELING);
n2->RemoveAura(SPELL_NECROLYTE_CHANNELING);
}
// }
for (SummonList::iterator itr = summons.begin(); itr != summons.end(); ++itr)
if (Creature* c = pInstance->instance->GetCreature(*itr))
@@ -401,13 +401,17 @@ public:
isInvincible = true;
// TODO This spell check is invalid
if (SPELL_NECROLYTE_CHANNELING)
me->CastSpell(me, SPELL_NECROLYTE_CHANNELING, false);
// if (SPELL_NECROLYTE_CHANNELING)
me->CastSpell(me, SPELL_NECROLYTE_CHANNELING, false);
if (me->GetPositionY() < 206.0f)
{
pInstance->SetData64(DATA_NECROLYTE_1_GUID, me->GetGUID());
}
else
{
pInstance->SetData64(DATA_NECROLYTE_2_GUID, me->GetGUID());
}
}
}
}
@@ -421,8 +425,8 @@ public:
void EnterCombat(Unit* /*who*/)
{
// TODO This spell check is invalid
if (SPELL_NECROLYTE_CHANNELING)
me->RemoveAura(SPELL_NECROLYTE_CHANNELING);
// if (SPELL_NECROLYTE_CHANNELING)
me->RemoveAura(SPELL_NECROLYTE_CHANNELING);
events.Reset();
events.RescheduleEvent(1, 0);
events.RescheduleEvent(2, urand(5000,9000));