aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Outland
diff options
context:
space:
mode:
authorPeter Keresztes Schmidt <carbenium@outlook.com>2020-07-18 20:42:28 +0200
committerShauren <shauren.trinity@gmail.com>2022-01-23 22:02:03 +0100
commitad340466d09ae6de8adc20949f433772cb016b54 (patch)
tree99127eb685dab4aa1aa90e79cbba958bf6dea80e /src/server/scripts/Outland
parentfda8a09766bf733ccf97743ea5b884c900f44c28 (diff)
Misc: Use [[fallthrough]] attribute instead of comment to mark intentional fallthroughs (#25054)
Related: #25006 (cherry picked from commit 85b5b842ca6c05d4e51081e6c3282940a80f3761)
Diffstat (limited to 'src/server/scripts/Outland')
-rw-r--r--src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp2
-rw-r--r--src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp2
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp2
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp6
4 files changed, 6 insertions, 6 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index d4ba1ea2db2..97d5fa75ab5 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -191,7 +191,7 @@ class instance_black_temple : public InstanceMapScript
for (ObjectGuid ashtongueGuid : AshtongueGUIDs)
if (Creature* ashtongue = instance->GetCreature(ashtongueGuid))
ashtongue->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
- /* fallthrough */
+ [[fallthrough]];
case DATA_TERON_GOREFIEND:
case DATA_GURTOGG_BLOODBOIL:
case DATA_RELIQUARY_OF_SOULS:
diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
index 5ee5a8032bb..eca916a89ee 100644
--- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
@@ -60,7 +60,7 @@ class instance_gruuls_lair : public InstanceMapScript
{
case NPC_MAULGAR:
MaulgarGUID = creature->GetGUID();
- /* fallthrough */
+ [[fallthrough]];
case NPC_KROSH_FIREHAND:
case NPC_OLM_THE_SUMMONER:
case NPC_KIGGLER_THE_CRAZED:
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
index 58e3494f18d..fb70d79975f 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -103,7 +103,7 @@ class instance_blood_furnace : public InstanceMapScript
{
case GO_PRISON_DOOR_04:
PrisonDoor4GUID = go->GetGUID();
- /* fallthrough */
+ [[fallthrough]];
case GO_PRISON_DOOR_01:
case GO_PRISON_DOOR_02:
case GO_PRISON_DOOR_03:
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
index d497edc4998..b4d721396bf 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
@@ -143,13 +143,13 @@ class boss_shattered_executioner : public CreatureScript
{
case 3:
me->RemoveLootMode(LOOT_MODE_HARD_MODE_1);
- /* fallthrough */
+ [[fallthrough]];
case 2:
me->RemoveLootMode(LOOT_MODE_HARD_MODE_2);
- /* fallthrough */
+ [[fallthrough]];
case 1:
me->RemoveLootMode(LOOT_MODE_HARD_MODE_3);
- /* fallthrough */
+ [[fallthrough]];
default:
break;
}