aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp2
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp2
-rw-r--r--src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp2
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp2
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp2
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp16
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp2
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp2
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp6
-rw-r--r--src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp2
-rw-r--r--src/server/scripts/Northrend/zone_sholazar_basin.cpp2
-rw-r--r--src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp2
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp6
17 files changed, 28 insertions, 28 deletions
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
index 00d33790d43..168a988c867 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
@@ -109,7 +109,7 @@ class boss_salramm : public CreatureScript
break;
case EVENT_EXPLODE_GHOUL2:
events.ScheduleEvent(EVENT_SUMMON_GHOULS, Seconds(4));
- /* fallthrough */
+ [[fallthrough]];
case EVENT_EXPLODE_GHOUL1:
Talk(SAY_EXPLODE_GHOUL);
DoCastAOE(SPELL_EXPLODE_GHOUL, true);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
index 02dd358ed0e..764a4802b88 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
@@ -360,7 +360,7 @@ class npc_chromie_start : public CreatureScript
break;
case GOSSIP_OFFSET_SKIP_1:
AdvanceDungeonFar();
- /* fallthrough */
+ [[fallthrough]];
case GOSSIP_OFFSET_TELEPORT:
CloseGossipMenuFor(player);
me->CastSpell(player, SPELL_TELEPORT_PLAYER);
diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
index a8a4971d861..2a3192c241a 100644
--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -562,7 +562,7 @@ public:
Spark->DisappearAndDie();
DespawnNagaFlag(false);
me->DisappearAndDie();
- /* fallthrough */
+ [[fallthrough]];
default:
return 99999999;
}
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
index 99abf037c4f..e33320b6622 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -769,7 +769,7 @@ struct npc_hadronox_foeAI : public ScriptedAI
me->GetMotionMaster()->MovePoint(MOVE_DOWNSTAIRS_2, downstairsMoves2[_mySpawn]);
break;
}
- /* fallthrough */
+ [[fallthrough]];
case MOVE_HADRONOX:
case MOVE_HADRONOX_REAL:
{
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
index 34cf55020c0..32e87d8139c 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
@@ -139,7 +139,7 @@ class boss_general_zarithrian : public CreatureScript
{
case EVENT_SUMMON_ADDS:
Talk(SAY_ADDS);
- /* fallthrough */
+ [[fallthrough]];
case EVENT_SUMMON_ADDS2:
{
if (Creature* stalker1 = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_ZARITHRIAN_SPAWN_STALKER_1)))
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index ed0471ae6ec..45c0a094489 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -157,7 +157,7 @@ class instance_halls_of_reflection : public InstanceMapScript
case NPC_WORLD_TRIGGER:
if (!creature->GetTransport())
break;
- /* fallthrough */
+ [[fallthrough]];
case NPC_GUNSHIP_CANNON_HORDE:
GunshipCannonGUIDs.insert(creature->GetGUID());
break;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
index 2242d93a1cd..189be71df0c 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
@@ -231,7 +231,7 @@ class boss_lord_marrowgar : public CreatureScript
me->SetSpeedRate(MOVE_RUN, _baseSpeed*3.0f);
Talk(SAY_BONE_STORM);
events.ScheduleEvent(EVENT_BONE_STORM_END, _boneStormDuration + 1ms);
- /* fallthrough */
+ [[fallthrough]];
case EVENT_BONE_STORM_MOVE:
{
events.ScheduleEvent(EVENT_BONE_STORM_MOVE, _boneStormDuration/3);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp
index 9fc310aa781..3df14a192b6 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp
@@ -1199,7 +1199,7 @@ struct npc_frostwing_ymirjar_vrykul : public ScriptedAI
{
case NPC_YMIRJAR_FROSTBINDER:
me->RemoveAurasDueToSpell(SPELL_ARCTIC_CHILL);
- /* fallthrough */
+ [[fallthrough]];
case NPC_YMIRJAR_DEATHBRINGER:
_OOCevents.ScheduleEvent(EVENT_YMIRJAR_SPIRIT_STREAM, 10s, 20s);
break;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
index b46851e7918..82932615cb3 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
@@ -233,7 +233,7 @@ class ValithriaDespawner : public BasicEvent
case NPC_VALITHRIA_DREAMWALKER:
if (InstanceScript* instance = creature->GetInstanceScript())
instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, creature);
- /* fallthrough */
+ [[fallthrough]];
case NPC_BLAZING_SKELETON:
case NPC_SUPPRESSER:
case NPC_BLISTERING_ZOMBIE:
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
index abcce451423..652b7e1b50f 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
@@ -1217,7 +1217,7 @@ class instance_icecrown_citadel : public InstanceMapScript
case DATA_THE_LICH_KING:
if (GetBossState(DATA_PROFESSOR_PUTRICIDE) != DONE)
return false;
- /* fallthrough */
+ [[fallthrough]];
case DATA_PROFESSOR_PUTRICIDE:
if (GetBossState(DATA_FESTERGUT) != DONE || GetBossState(DATA_ROTFACE) != DONE)
return false;
@@ -1236,7 +1236,7 @@ class instance_icecrown_citadel : public InstanceMapScript
case DATA_THE_LICH_KING:
if (GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) != DONE)
return false;
- /* fallthrough */
+ [[fallthrough]];
case DATA_BLOOD_QUEEN_LANA_THEL:
if (GetBossState(DATA_BLOOD_PRINCE_COUNCIL) != DONE)
return false;
@@ -1255,7 +1255,7 @@ class instance_icecrown_citadel : public InstanceMapScript
case DATA_THE_LICH_KING:
if (GetBossState(DATA_SINDRAGOSA) != DONE)
return false;
- /* fallthrough */
+ [[fallthrough]];
case DATA_SINDRAGOSA:
if (GetBossState(DATA_VALITHRIA_DREAMWALKER) != DONE)
return false;
@@ -1281,19 +1281,19 @@ class instance_icecrown_citadel : public InstanceMapScript
case DATA_FESTERGUT:
if (GetBossState(DATA_DEATHBRINGER_SAURFANG) != DONE)
return false;
- /* fallthrough */
+ [[fallthrough]];
case DATA_DEATHBRINGER_SAURFANG:
if (GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) != DONE)
return false;
- /* fallthrough */
+ [[fallthrough]];
case DATA_ICECROWN_GUNSHIP_BATTLE:
if (GetBossState(DATA_LADY_DEATHWHISPER) != DONE)
return false;
- /* fallthrough */
+ [[fallthrough]];
case DATA_LADY_DEATHWHISPER:
if (GetBossState(DATA_LORD_MARROWGAR) != DONE)
return false;
- /* fallthrough */
+ [[fallthrough]];
case DATA_LORD_MARROWGAR:
default:
break;
@@ -1423,7 +1423,7 @@ class instance_icecrown_citadel : public InstanceMapScript
case EVENT_ENEMY_GUNSHIP_COMBAT:
if (Creature* captain = source->FindNearestCreature(TeamInInstance == HORDE ? NPC_IGB_HIGH_OVERLORD_SAURFANG : NPC_IGB_MURADIN_BRONZEBEARD, 100.0f))
captain->AI()->DoAction(ACTION_ENEMY_GUNSHIP_TALK);
- /* fallthrough */
+ [[fallthrough]];
case EVENT_PLAYERS_GUNSHIP_SPAWN:
case EVENT_PLAYERS_GUNSHIP_COMBAT:
if (GameObject* go = source->ToGameObject())
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
index ceb351b6997..e624870663b 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
@@ -594,7 +594,7 @@ struct npc_gothik_minion_baseAI : public ScriptedAI
{
case ACTION_GATE_OPENED:
_gateIsOpen = true;
- /* fallthrough */
+ [[fallthrough]];
case ACTION_ACQUIRE_TARGET:
if (Player* target = FindEligibleTarget(me, _gateIsOpen))
{
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
index 9d86ed8408d..1a1ed14e7e6 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
@@ -223,7 +223,7 @@ class boss_kologarn : public CreatureScript
break;
case NPC_RUBBLE:
summons.Summon(summon);
- // absence of break intended
+ [[fallthrough]];
default:
return;
}
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
index 8922144d67b..54a48a47019 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
@@ -740,7 +740,7 @@ class boss_leviathan_mk_ii : public CreatureScript
DoCast(me, SPELL_EMERGENCY_MODE);
DoCastAOE(SPELL_EMERGENCY_MODE_TURRET);
events.ScheduleEvent(EVENT_FLAME_SUPPRESSANT_MK, 1min, 0, PHASE_LEVIATHAN_MK_II);
- /* fallthrough */
+ [[fallthrough]];
case DO_START_MKII:
me->SetReactState(REACT_AGGRESSIVE);
events.SetPhase(PHASE_LEVIATHAN_MK_II);
@@ -985,7 +985,7 @@ class boss_vx_001 : public CreatureScript
DoCast(me, SPELL_EMERGENCY_MODE);
events.ScheduleEvent(EVENT_FROST_BOMB, 1s);
events.ScheduleEvent(EVENT_FLAME_SUPPRESSANT_VX, 6s);
- /* fallthrough */
+ [[fallthrough]];
case DO_START_VX001:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
me->SetImmuneToPC(false);
@@ -1166,7 +1166,7 @@ class boss_aerial_command_unit : public CreatureScript
fireFigther = true;
DoCast(me, SPELL_EMERGENCY_MODE);
events.ScheduleEvent(EVENT_SUMMON_FIRE_BOTS, 1s, 0, PHASE_AERIAL_COMMAND_UNIT);
- /* fallthrough */
+ [[fallthrough]];
case DO_START_AERIAL:
me->SetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_ANIM_TIER, UNIT_BYTE1_FLAG_HOVER);
me->SetDisableGravity(false);
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index cda78ea331e..b9f28381643 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -742,7 +742,7 @@ class instance_violet_hold : public InstanceMapScript
guard->SetImmuneToAll(true);
}
}
- /* fallthrough */
+ [[fallthrough]];
default:
if (boss->isDead())
{
diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
index 9628a041896..309b70fe669 100644
--- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
@@ -517,8 +517,8 @@ public:
/// @todo Make crunchy perform emote eat when he reaches the bird
break;
}
+ [[fallthrough]];
}
- /* fallthrough */
case EVENT_MISS:
{
shooter->CastSpell(wilhelm, SPELL_MISS_APPLE);
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index f894466f7c8..dcaff1cb12c 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/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;
}