diff options
Diffstat (limited to 'src/server/scripts')
13 files changed, 26 insertions, 20 deletions
diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 8f5a394bc98..f1faeb91c34 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -565,7 +565,9 @@ public: Spark->DisappearAndDie(); DespawnNagaFlag(false); me->DisappearAndDie(); - default: return 99999999; + /* 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 f12ea511fbf..2940421e150 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; } - // intentional missing break + /* 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 31cb29f2820..3a7333302dc 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); - // no break + /* 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 fbab443f327..7eb304696a2 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; - // no break + /* 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 abc34f35245..81a0dd61ee2 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+1); - // no break here + /* fallthrough */ case EVENT_BONE_STORM_MOVE: { events.ScheduleEvent(EVENT_BONE_STORM_MOVE, _boneStormDuration/3); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 8aee76d186e..4529f8a0614 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -230,7 +230,7 @@ class ValithriaDespawner : public BasicEvent case NPC_VALITHRIA_DREAMWALKER: if (InstanceScript* instance = creature->GetInstanceScript()) instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, creature); - // no break + /* 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 3f6f2f59f6e..dc7ca418e85 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -1201,7 +1201,7 @@ class instance_icecrown_citadel : public InstanceMapScript case DATA_THE_LICH_KING: if (GetBossState(DATA_PROFESSOR_PUTRICIDE) != DONE) return false; - // no break + /* fallthrough */ case DATA_PROFESSOR_PUTRICIDE: if (GetBossState(DATA_FESTERGUT) != DONE || GetBossState(DATA_ROTFACE) != DONE) return false; @@ -1220,7 +1220,7 @@ class instance_icecrown_citadel : public InstanceMapScript case DATA_THE_LICH_KING: if (GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) != DONE) return false; - // no break + /* fallthrough */ case DATA_BLOOD_QUEEN_LANA_THEL: if (GetBossState(DATA_BLOOD_PRINCE_COUNCIL) != DONE) return false; @@ -1239,7 +1239,7 @@ class instance_icecrown_citadel : public InstanceMapScript case DATA_THE_LICH_KING: if (GetBossState(DATA_SINDRAGOSA) != DONE) return false; - // no break + /* fallthrough */ case DATA_SINDRAGOSA: if (GetBossState(DATA_VALITHRIA_DREAMWALKER) != DONE) return false; @@ -1265,19 +1265,19 @@ class instance_icecrown_citadel : public InstanceMapScript case DATA_FESTERGUT: if (GetBossState(DATA_DEATHBRINGER_SAURFANG) != DONE) return false; - // no break + /* fallthrough */ case DATA_DEATHBRINGER_SAURFANG: if (GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) != DONE) return false; - // no break + /* fallthrough */ case DATA_ICECROWN_GUNSHIP_BATTLE: if (GetBossState(DATA_LADY_DEATHWHISPER) != DONE) return false; - // no break + /* fallthrough */ case DATA_LADY_DEATHWHISPER: if (GetBossState(DATA_LORD_MARROWGAR) != DONE) return false; - // no break + /* fallthrough */ case DATA_LORD_MARROWGAR: default: break; @@ -1408,7 +1408,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); - // no break; + /* 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 951104f87ba..c00cb423fb5 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; - // intentional missing break + /* fallthrough */ case ACTION_ACQUIRE_TARGET: if (Player* target = FindEligibleTarget(me, _gateIsOpen)) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index ff48c1bd383..7cd71a8a5b7 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); - // Missing break intended. + /* 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); - // Missing break intended. + /* 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); - // Missing break intended. + /* 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 e665752c054..4fbd3bf6ad5 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -736,7 +736,7 @@ class instance_violet_hold : public InstanceMapScript guard->SetImmuneToAll(true); } } - // no break + /* 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 ebcca1b6dd1..5c9538c7d27 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -538,6 +538,7 @@ public: break; } } + /* 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 2b9200611b8..0f084fbbaec 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -190,7 +190,7 @@ class instance_black_temple : public InstanceMapScript for (ObjectGuid ashtongueGuid : AshtongueGUIDs) if (Creature* ashtongue = instance->GetCreature(ashtongueGuid)) ashtongue->SetFaction(FACTION_ASHTONGUE_DEATHSWORN); - // no break + /* 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 3aca862309d..498b90a5e46 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp @@ -143,10 +143,13 @@ class boss_shattered_executioner : public CreatureScript { case 3: me->RemoveLootMode(LOOT_MODE_HARD_MODE_1); + /* fallthrough */ case 2: me->RemoveLootMode(LOOT_MODE_HARD_MODE_2); + /* fallthrough */ case 1: me->RemoveLootMode(LOOT_MODE_HARD_MODE_3); + /* fallthrough */ default: break; } |