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

@@ -198,6 +198,7 @@ public:
banReturn = sBan->BanAccountByPlayerName(nameOrIP, durationStr, reasonStr, handler->GetSession() ? handler->GetSession()->GetPlayerName() : "");
break;
case BAN_IP:
default:
banReturn = sBan->BanIP(nameOrIP, durationStr, reasonStr, handler->GetSession() ? handler->GetSession()->GetPlayerName() : "");
break;
}

View File

@@ -42,19 +42,21 @@ public:
{
switch (creature->GetEntry())
{
case NPC_KILREK:
m_uiKilrekGUID = creature->GetGUID();
break;
case NPC_TERESTIAN_ILLHOOF:
m_uiTerestianGUID = creature->GetGUID();
break;
case NPC_MOROES:
m_uiMoroesGUID = creature->GetGUID();
break;
case NPC_NIGHTBANE:
m_uiNightBaneGUID = creature->GetGUID();
case NPC_RELAY:
m_uiRelayGUID = creature->GetGUID();
case NPC_KILREK:
m_uiKilrekGUID = creature->GetGUID();
break;
case NPC_TERESTIAN_ILLHOOF:
m_uiTerestianGUID = creature->GetGUID();
break;
case NPC_MOROES:
m_uiMoroesGUID = creature->GetGUID();
break;
case NPC_NIGHTBANE:
m_uiNightBaneGUID = creature->GetGUID();
break;
case NPC_RELAY:
m_uiRelayGUID = creature->GetGUID();
break;
}
}

View File

@@ -408,8 +408,8 @@ public:
{
allowQuest = true;
eventStarted = 1;
float x, y, z, o;
uint32 path;
float x = 0, y = 0, z = 0, o = 0;
uint32 path = 0;
GetInitXYZ(x, y, z, o, path);
if (Creature* cr = me->SummonCreature(NPC_SHADE_OF_HORSEMAN, x, y, z, o, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000))
{
@@ -602,6 +602,7 @@ class npc_hallows_end_soh : public CreatureScript
case 235434: x = 360.9f; y = -4735.5f; z = 11.773f; break;
case 235435: x = 2229.4f; y = 263.1f; z = 36.13f; break;
case 235436: x = 9532.9f; y = -6833.8f; z = 18.5f; break;
default: x = 0; y = 0; z = 0; break;
}
}

View File

@@ -238,7 +238,10 @@ public:
{
instance->LoadGrid(instancePositions[2].GetPositionX(), instancePositions[2].GetPositionY());
if (Creature* drake = instance->SummonCreature(NPC_LIEUTENANT_DRAKE, instancePositions[2]))
{
drake->AI()->Talk(0);
}
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
}
case EVENT_THRALL_REPOSITION:
{

View File

@@ -173,6 +173,7 @@ class boss_hadronox : public CreatureScript
break;
case EVENT_HADRONOX_MOVE4:
me->CastSpell(me, SPELL_WEB_FRONT_DOORS, true);
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case EVENT_HADRONOX_MOVE1:
case EVENT_HADRONOX_MOVE2:
case EVENT_HADRONOX_MOVE3:

View File

@@ -227,8 +227,10 @@ class boss_halion : public CreatureScript
case NPC_METEOR_STRIKE_FLAME:
if (Is25ManRaid() && IsHeroic() && roll_chance_i(90) && summons.GetEntryCount(NPC_LIVING_EMBER) < _livingEmberCount + 12)
if (Creature* ember = me->SummonCreature(NPC_LIVING_EMBER, *summon, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000))
{
ember->SetVisible(false);
// no break
}
[[fallthrough]];
case NPC_METEOR_STRIKE_NORTH:
case NPC_METEOR_STRIKE_SOUTH:
case NPC_METEOR_STRIKE_WEST:

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));

View File

@@ -1101,7 +1101,7 @@ class instance_icecrown_citadel : public InstanceMapScript
loot->SetLootRecipient(deathbringer->GetLootRecipient());
loot->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED | GO_FLAG_NOT_SELECTABLE | GO_FLAG_NODESPAWN);
}
// no break
[[fallthrough]];
case NOT_STARTED:
if (GameObject* teleporter = instance->GetGameObject(SaurfangTeleportGUID))
{
@@ -1460,8 +1460,10 @@ class instance_icecrown_citadel : public InstanceMapScript
{
case DATA_THE_LICH_KING:
if (GetBossState(DATA_PROFESSOR_PUTRICIDE) != DONE)
{
return false;
// no break
}
[[fallthrough]];
case DATA_PROFESSOR_PUTRICIDE:
if (GetBossState(DATA_FESTERGUT) != DONE || GetBossState(DATA_ROTFACE) != DONE)
return false;
@@ -1479,8 +1481,10 @@ class instance_icecrown_citadel : public InstanceMapScript
{
case DATA_THE_LICH_KING:
if (GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) != DONE)
{
return false;
// no break
}
[[fallthrough]];
case DATA_BLOOD_QUEEN_LANA_THEL:
if (GetBossState(DATA_BLOOD_PRINCE_COUNCIL) != DONE)
return false;
@@ -1498,13 +1502,19 @@ class instance_icecrown_citadel : public InstanceMapScript
{
case DATA_THE_LICH_KING:
if (GetBossState(DATA_SINDRAGOSA) != DONE)
{
return false;
// no break
}
[[fallthrough]];
case DATA_SINDRAGOSA:
if (GetBossState(DATA_VALITHRIA_DREAMWALKER) != DONE)
{
return false;
}
if (GetBossState(DATA_SINDRAGOSA_GAUNTLET) != DONE)
{
return false;
}
break;
default:
break;
@@ -1526,20 +1536,28 @@ class instance_icecrown_citadel : public InstanceMapScript
case DATA_ROTFACE:
case DATA_FESTERGUT:
if (GetBossState(DATA_DEATHBRINGER_SAURFANG) != DONE)
{
return false;
// no break
}
[[fallthrough]];
case DATA_DEATHBRINGER_SAURFANG:
if (GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) != DONE)
{
return false;
// no break
}
[[fallthrough]];
case DATA_ICECROWN_GUNSHIP_BATTLE:
if (GetBossState(DATA_LADY_DEATHWHISPER) != DONE)
{
return false;
// no break
}
[[fallthrough]];
case DATA_LADY_DEATHWHISPER:
if (GetBossState(DATA_LORD_MARROWGAR) != DONE)
{
return false;
// no break
}
[[fallthrough]];
case DATA_LORD_MARROWGAR:
default:
break;
@@ -1751,8 +1769,10 @@ class instance_icecrown_citadel : public InstanceMapScript
break;
case EVENT_ENEMY_GUNSHIP_COMBAT:
if (Creature* captain = source->FindNearestCreature(TeamIdInInstance == TEAM_HORDE ? NPC_IGB_HIGH_OVERLORD_SAURFANG : NPC_IGB_MURADIN_BRONZEBEARD, 200.0f))
{
captain->AI()->DoAction(ACTION_ENEMY_GUNSHIP_TALK);
// no break;
}
[[fallthrough]];
case EVENT_PLAYERS_GUNSHIP_SPAWN:
case EVENT_PLAYERS_GUNSHIP_COMBAT:
if (GameObject* go = source->ToGameObject())

View File

@@ -1278,6 +1278,7 @@ public:
break;
}
[[fallthrough]];
}
case EVENT_MISS:
{

View File

@@ -45,7 +45,7 @@ class instance_gruuls_lair : public InstanceMapScript
{
case NPC_MAULGAR:
_maulgarGUID = creature->GetGUID();
// no break;
[[fallthrough]];
case NPC_KROSH_FIREHAND:
case NPC_OLM_THE_SUMMONER:
case NPC_KIGGLER_THE_CRAZED:

View File

@@ -508,7 +508,7 @@ public:
_events.Update(diff);
switch (uint32 eventId = _events.ExecuteEvent())
switch (_events.ExecuteEvent())
{
case EVENT_SPELL_ISHANAH_HOLY_SMITE:
me->CastSpell(me->GetVictim(), HOLY_SMITE_ISHANAH, false);