diff options
Diffstat (limited to 'src/server/scripts')
21 files changed, 33 insertions, 33 deletions
diff --git a/src/server/scripts/Battlefield/BattlefieldTB.cpp b/src/server/scripts/Battlefield/BattlefieldTB.cpp index 172fd207b86..5295f1f51ea 100644 --- a/src/server/scripts/Battlefield/BattlefieldTB.cpp +++ b/src/server/scripts/Battlefield/BattlefieldTB.cpp @@ -840,14 +840,14 @@ void TolBaradCapturePoint::ChangeTeam(TeamId /*oldTeam*/) break; case BF_CAPTUREPOINT_OBJECTIVESTATE_HORDE_ALLIANCE_CHALLENGE: m_Bf->SendWarning(TBCapturePoints[iBase].textLost[TEAM_HORDE]); - /* fallthrough */ + [[fallthrough]]; case BF_CAPTUREPOINT_OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE: SendUpdateWorldState(TBCapturePoints[iBase].wsCapturing[TEAM_ALLIANCE], uint32(1)); GetCapturePointGo()->SetGoArtKit(TB_GO_ARTKIT_FLAG_NONE); break; case BF_CAPTUREPOINT_OBJECTIVESTATE_ALLIANCE_HORDE_CHALLENGE: m_Bf->SendWarning(TBCapturePoints[iBase].textLost[TEAM_ALLIANCE]); - /* fallthrough */ + [[fallthrough]]; case BF_CAPTUREPOINT_OBJECTIVESTATE_NEUTRAL_HORDE_CHALLENGE: SendUpdateWorldState(TBCapturePoints[iBase].wsCapturing[TEAM_HORDE], uint32(1)); GetCapturePointGo()->SetGoArtKit(TB_GO_ARTKIT_FLAG_NONE); 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 075e7315285..7e23293e527 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 @@ -110,7 +110,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 eac319c4191..6296fe7c30b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -361,7 +361,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/HallsOfOrigination/instance_halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp index 83ecd9ca6c5..dddd6ec7ef7 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp @@ -62,7 +62,7 @@ class instance_halls_of_origination : public InstanceMapScript { case GO_ANHUURS_BRIDGE: AnhuursBridgeGUID = go->GetGUID(); - /* fallthrough */ + [[fallthrough]]; case GO_DOODAD_ULDUM_ELEVATOR_COL01: case GO_VAULT_OF_LIGHTS_DOOR: case GO_DOODAD_ULDUM_LIGHTMACHINE_01: diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 6f506da40d8..9c6093f7751 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -561,7 +561,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 cebaa9350c7..bc66e9eedd6 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 e56b0e70f36..0ede1122c8d 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 077317428bc..fb554fc2298 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 @@ -161,7 +161,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 d7be699d535..bffb633fc2d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -230,7 +230,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 cee3a1b5144..6eef2115fde 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp @@ -1186,7 +1186,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 f69b01e2052..8185c2f5438 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -234,7 +234,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 c2c8e01202f..897abf36ac9 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -1214,7 +1214,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; @@ -1233,7 +1233,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; @@ -1252,7 +1252,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; @@ -1278,19 +1278,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; @@ -1420,7 +1420,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 5723be96215..5661ac8bb9f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -589,7 +589,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 eb6bf3855c6..6ce48f1e3e4 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 002a75f32ad..e7c473f5e69 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -742,7 +742,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); @@ -987,7 +987,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->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE)); me->SetImmuneToPC(false); @@ -1169,7 +1169,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->SetAnimTier(UNIT_BYTE1_FLAG_HOVER, true); 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 6ac9201d023..844419be067 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -745,7 +745,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 e0df74454f9..5d9fae1ba11 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -516,8 +516,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 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; } |