diff options
21 files changed, 30 insertions, 2 deletions
diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake index bef2c20715a..959f954041e 100644 --- a/cmake/compiler/clang/settings.cmake +++ b/cmake/compiler/clang/settings.cmake @@ -9,6 +9,7 @@ if(WITH_WARNINGS) -W -Wall -Wextra + -Wimplicit-fallthrough -Winit-self -Wfatal-errors -Wno-mismatched-tags diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 8203d22b478..bb4ada2d61c 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -12205,6 +12205,7 @@ Item* Player::EquipItem(uint16 pos, Item* pItem, bool update) case EQUIPMENT_SLOT_OFFHAND: case EQUIPMENT_SLOT_RANGED: RecalculateRating(CR_ARMOR_PENETRATION); + break; default: break; } @@ -12373,6 +12374,7 @@ void Player::RemoveItem(uint8 bag, uint8 slot, bool update) case EQUIPMENT_SLOT_OFFHAND: case EQUIPMENT_SLOT_RANGED: RecalculateRating(CR_ARMOR_PENETRATION); + break; default: break; } @@ -12503,6 +12505,7 @@ void Player::DestroyItem(uint8 bag, uint8 slot, bool update) case EQUIPMENT_SLOT_OFFHAND: case EQUIPMENT_SLOT_RANGED: RecalculateRating(CR_ARMOR_PENETRATION); + break; default: break; } @@ -19913,6 +19916,7 @@ void Player::_SaveInventory(CharacterDatabaseTransaction& trans) stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CHAR_INVENTORY_BY_ITEM); stmt->setUInt32(0, item->GetGUID().GetCounter()); trans->Append(stmt); + break; case ITEM_UNCHANGED: break; } @@ -24997,6 +25001,7 @@ void Player::_LoadSkills(PreparedQueryResult result) break; case SKILL_RANGE_LEVEL: max = GetMaxSkillValueForLevel(); + break; default: break; } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 7159afa9f15..0a6202e842b 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10602,6 +10602,7 @@ uint32 Unit::GetCastingTimeForBonus(SpellInfo const* spellProto, DamageEffectTyp ++effects; break; } + break; default: break; } diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 8bc95a3f899..d0664b45ba4 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -676,6 +676,7 @@ void WorldSession::HandlePartyAssignmentOpcode(WorldPacket& recvData) case GROUP_ASSIGN_MAINTANK: group->RemoveUniqueGroupMemberFlag(MEMBER_FLAG_MAINTANK); // Remove main assist flag from current if any. group->SetGroupMemberFlag(guid, apply, MEMBER_FLAG_MAINTANK); + break; default: break; } diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index a5dd811e255..76414ddffe6 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3114,6 +3114,7 @@ size_t Map::DespawnAll(SpawnObjectType type, ObjectGuid::LowType spawnId) case SPAWN_TYPE_GAMEOBJECT: for (auto const& pair : Trinity::Containers::MapEqualRange(GetGameObjectBySpawnIdStore(), spawnId)) toUnload.push_back(pair.second); + break; default: break; } diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 6079fec3948..b65358a706f 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -802,6 +802,7 @@ void AuraEffect::ApplySpellMod(Unit* target, bool apply) } } } + break; } default: break; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index e7a0635100c..5be84d96a69 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1752,6 +1752,7 @@ void Spell::SendLoot(ObjectGuid guid, LootType loottype) gameObjTarget->TriggeringLinkedGameObject(trapEntry, player); // Don't return, let loots been taken + break; default: break; } diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 24a587a161c..60122176508 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -3498,10 +3498,12 @@ bool _isPositiveEffectImpl(SpellInfo const* spellInfo, uint8 effIndex, std::unor case SPELL_EFFECT_HEAL_PCT: return true; case SPELL_EFFECT_INSTAKILL: - if (i != effIndex && // for spells like 38044: instakill effect is negative but auras on target must count as buff + if (i != effIndex && + // for spells like 38044: instakill effect is negative but auras on target must count as buff spellInfo->Effects[i].TargetA.GetTarget() == spellInfo->Effects[effIndex].TargetA.GetTarget() && spellInfo->Effects[i].TargetB.GetTarget() == spellInfo->Effects[effIndex].TargetB.GetTarget()) - return false; + return false; + break; default: break; } diff --git a/src/server/scripts/Battlefield/BattlefieldWG.cpp b/src/server/scripts/Battlefield/BattlefieldWG.cpp index 94b8287504e..8b33c154eb3 100644 --- a/src/server/scripts/Battlefield/BattlefieldWG.cpp +++ b/src/server/scripts/Battlefield/BattlefieldWG.cpp @@ -774,6 +774,7 @@ void BattlefieldWG::DoCompleteOrIncrementAchievement(uint32 achievement, Player* case ACHIEVEMENTS_WIN_WG_100: { // player->UpdateAchievementCriteria(); + break; } default: { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp index a7607e62c99..b3093e6572e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -306,6 +306,7 @@ public: for (GuidList::const_iterator itr = _incarceratorList.begin(); itr != _incarceratorList.end(); ++itr) if (Creature* creature = instance->GetCreature(*itr)) creature->Respawn(); + break; default: break; } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index f799388f88e..a58a3f10c23 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -125,6 +125,7 @@ class instance_magisters_terrace : public InstanceMapScript case NPC_SUNBLADE_BLOOD_KNIGHT: if (creature->GetDistance(KaelthasTrashGroupDistanceComparisonPos) < 10.0f) _kaelthasPreTrashGUIDs.insert(creature->GetGUID()); + break; default: break; } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index 64a5861db26..c6532c4209c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -146,6 +146,7 @@ struct boss_high_inquisitor_fairbanks : public BossAI if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 30.f, true, false)) DoCast(target, SPELL_SLEEP); events.Repeat(30s); + break; default: break; } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp index a166c9632d0..e78cdd74b11 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp @@ -1485,6 +1485,7 @@ public: chromie->AI()->Talk(RP5_LINE_CHROMIE0); chromie->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER); } + break; default: break; } diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 890833dadcd..450be7bb1de 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -333,8 +333,11 @@ public: std::list<Creature*> creatureList; GetCreatureListWithEntryInGrid(creatureList, me, NPC_BLOODMYST_TESLA_COIL, 500.0f); if (!creatureList.empty()) + { for (std::list<Creature*>::iterator itr = creatureList.begin(); itr != creatureList.end(); ++itr) (*itr)->InterruptNonMeleeSpells(true, SPELL_BLOODMYST_TESLA); + } + break; } default: break; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 708be83e9b6..4b1ebf72b19 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -693,6 +693,7 @@ class boss_professor_putricide : public CreatureScript default: break; } + break; } default: break; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 996466767a0..8a01f6ab04e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -353,6 +353,7 @@ class npc_big_ooze : public CreatureScript case EVENT_STICKY_OOZE: DoCastVictim(SPELL_STICKY_OOZE); events.ScheduleEvent(EVENT_STICKY_OOZE, 15s); + break; default: break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 54efc5752ea..51b8c3c864b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -816,6 +816,7 @@ public: me->SetImmuneToPC(true); me->DespawnOrUnsummon(30 * IN_MILLISECONDS); // just in case anything interrupts the movement me->GetMotionMaster()->MoveTargetedHome(); + break; default: break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index aaad0626077..2eff9a38b93 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -796,6 +796,7 @@ public: if (GameObject* coil = myCoilGO()) coil->SetGoState(GO_STATE_READY); me->DespawnOrUnsummon(0, Hours(24 * 7)); + break; default: break; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 98c677586a4..c8c899e8408 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -355,6 +355,7 @@ class boss_flame_leviathan : public CreatureScript case DATA_ORBIT_ACHIEVEMENTS: if (ActiveTowers) // Only on HardMode return ActiveTowersCount; + break; default: break; } diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index dcaff1cb12c..5a45994b838 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -169,6 +169,7 @@ class instance_black_temple : public InstanceMapScript break; case DATA_AKAMA_ILLIDAN_INTRO: AkamaIllidanIntro = data; + break; default: break; } diff --git a/src/server/shared/DataStores/DBCDatabaseLoader.cpp b/src/server/shared/DataStores/DBCDatabaseLoader.cpp index dda81a839fe..5460be8ccf2 100644 --- a/src/server/shared/DataStores/DBCDatabaseLoader.cpp +++ b/src/server/shared/DataStores/DBCDatabaseLoader.cpp @@ -40,6 +40,7 @@ DBCDatabaseLoader::DBCDatabaseLoader(char const* tableName, char const* dbFormat { case FT_SQL_PRESENT: ++_sqlIndexPos; + break; case FT_SQL_ABSENT: break; default: |