From cbd6fb231530e55c653da6c26b158def8fe26113 Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Sat, 18 Jul 2020 20:43:16 +0200 Subject: [PATCH] Build: Enable -Wimplicit-fallthrough on clang (#25056) * Misc: Use [[fallthrough]] attribute instead of comment to mark intentional fallthroughs Related: #25006 * Misc: Add some missing breaks (no-ops) to satisfy clang Related: #25006 Closes #25055 * Build: Enable -Wimplicit-fallthrough on clang Closes #25006 # Conflicts: # src/server/game/Entities/Player/Player.cpp # src/server/game/Spells/SpellInfo.cpp # src/server/scripts/Battlefield/BattlefieldWG.cpp # src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp # src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp # src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp # src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp # src/server/shared/DataStores/DBCDatabaseLoader.cpp --- cmake/compiler/clang/settings.cmake | 1 + src/server/game/Entities/Player/Player.cpp | 2 ++ src/server/game/Entities/Unit/Unit.cpp | 1 + src/server/game/Handlers/GroupHandler.cpp | 1 + src/server/game/Maps/Map.cpp | 1 + src/server/game/Spells/Auras/SpellAuraEffects.cpp | 1 + src/server/game/Spells/SpellEffects.cpp | 1 + .../BlackrockSpire/instance_blackrock_spire.cpp | 1 + .../MagistersTerrace/instance_magisters_terrace.cpp | 1 + .../Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp | 1 + src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp | 3 +++ .../Northrend/IcecrownCitadel/boss_professor_putricide.cpp | 1 + src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp | 1 + src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp | 1 + src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp | 1 + .../scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp | 1 + .../scripts/Outland/BlackTemple/instance_black_temple.cpp | 1 + 17 files changed, 20 insertions(+) diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake index 78e8129d09..8df1b03753 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 d53a310db5..6b9c63bf77 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -20058,6 +20058,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; } @@ -25694,6 +25695,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 1705d0ca3c..d45c81588b 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11568,6 +11568,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 b55ee1a699..f4fc08a3f5 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -927,6 +927,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 66a8a2b017..83fd695597 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3205,6 +3205,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 29638ea7e0..7577b335aa 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -848,6 +848,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 3194a091b7..9235a2e728 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1570,6 +1570,7 @@ void Spell::SendLoot(ObjectGuid guid, LootType loottype) gameObjTarget->TriggeringLinkedGameObject(trapEntry, m_caster); // Don't return, let loots been taken + break; default: break; } 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 755d08c71c..7820ef3212 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -283,6 +283,7 @@ public: if (GetBossState(DATA_DRAGONSPIRE_ROOM) != DONE) Events.ScheduleEvent(EVENT_DARGONSPIRE_ROOM_STORE, 1000); } + 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 72b1447fc1..1a07515735 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -126,6 +126,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/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp index d8dbbb89b6..2550295681 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp @@ -1499,6 +1499,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 4793771d40..8f3b763e20 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 creatureList; GetCreatureListWithEntryInGrid(creatureList, me, NPC_BLOODMYST_TESLA_COIL, 500.0f); if (!creatureList.empty()) + { for (std::list::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 f84dd36b1a..e26048357d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -691,6 +691,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 44c328d174..ccd634c72a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -343,6 +343,7 @@ class npc_big_ooze : public CreatureScript case EVENT_STICKY_OOZE: DoCastVictim(SPELL_STICKY_OOZE); events.ScheduleEvent(EVENT_STICKY_OOZE, 15000); + break; default: break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index c1a11fd54e..7d4eddf3d2 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -809,6 +809,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); 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 7549b8ef8c..d4bbbc2ac2 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -835,6 +835,7 @@ public: case ACTION_TRANSITION_3: if (GameObject* coil = myCoilGO()) coil->SetGoState(GO_STATE_READY); + 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 9fe2868166..f8425f8fac 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -354,6 +354,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 b9a59f02c2..d647379888 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -168,6 +168,7 @@ class instance_black_temple : public InstanceMapScript break; case DATA_AKAMA_ILLIDAN_INTRO: AkamaIllidanIntro = data; + break; default: break; }