diff options
Diffstat (limited to 'src/server/scripts')
15 files changed, 30 insertions, 32 deletions
diff --git a/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp b/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp index bc96be615eb..d14fa3065e1 100644 --- a/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp +++ b/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp @@ -116,11 +116,8 @@ enum AnimKits ANIM_KIT_ID_CANNON_DESTROYED = 13264 }; -enum TargetSize : uint8 -{ - MIN_TARGETS_SIZE = 2, - MAX_TARGETS_SIZE = 6 -}; +constexpr uint8 MIN_TARGETS_SIZE = 2; +constexpr uint8 MAX_TARGETS_SIZE = 6; enum Misc { @@ -866,7 +863,7 @@ class spell_garothi_cannon_chooser : public SpellScript else if ((lastCannonEntry == NPC_DECIMATOR && annihilator) || (annihilator && !decimator)) { uint8 count = caster->GetMap()->GetDifficultyID() == DIFFICULTY_MYTHIC_RAID ? MAX_TARGETS_SIZE : - std::max<uint8>(MIN_TARGETS_SIZE, std::ceil(caster->GetMap()->GetPlayersCountExceptGMs() / 5)); + std::max<uint8>(MIN_TARGETS_SIZE, std::ceil(float(caster->GetMap()->GetPlayersCountExceptGMs()) / 5)); for (uint8 i = 0; i < count; i++) { 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 5ef89e39c47..4de12767b62 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp @@ -61,7 +61,7 @@ class instance_halls_of_origination : public InstanceMapScript { case GO_ANHUURS_BRIDGE: AnhuursBridgeGUID = go->GetGUID(); - // no break + /* 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/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 20d5fb31681..640fcfa3d23 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -779,7 +779,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 334b91eff20..8dddd60e7ff 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp @@ -136,7 +136,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 4a344e9a9e2..483a82898be 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 @@ -163,7 +163,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 1ab35165e5a..11b5ad24e9a 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/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 7c776cc1df4..5dce834d7b5 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -248,7 +248,7 @@ class instance_icecrown_citadel : public InstanceMapScript case NPC_SE_HIGH_OVERLORD_SAURFANG: if (TeamInInstance == ALLIANCE) creature->UpdateEntry(NPC_SE_MURADIN_BRONZEBEARD, creature->GetCreatureData()); - // no break; + /* fallthrough */ case NPC_SE_MURADIN_BRONZEBEARD: DeathbringerSaurfangEventGUID = creature->GetGUID(); creature->LastUsedScriptID = creature->GetScriptId(); @@ -1208,7 +1208,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; @@ -1227,7 +1227,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; @@ -1246,7 +1246,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; @@ -1272,19 +1272,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; @@ -1415,7 +1415,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 1d31e977a4d..46da6614e39 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; - // 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 20fee82c3b5..690a1ecdbfc 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -735,7 +735,7 @@ class boss_leviathan_mk_ii : public CreatureScript DoCast(me, SPELL_EMERGENCY_MODE); DoCastAOE(SPELL_EMERGENCY_MODE_TURRET); events.ScheduleEvent(EVENT_FLAME_SUPPRESSANT_MK, 60000, 0, PHASE_LEVIATHAN_MK_II); - // Missing break intended. + /* fallthrough */ case DO_START_MKII: me->SetReactState(REACT_AGGRESSIVE); events.SetPhase(PHASE_LEVIATHAN_MK_II); @@ -979,7 +979,7 @@ class boss_vx_001 : public CreatureScript DoCast(me, SPELL_EMERGENCY_MODE); events.ScheduleEvent(EVENT_FROST_BOMB, 1000); events.ScheduleEvent(EVENT_FLAME_SUPPRESSANT_VX, 6000); - // Missing break intended. + /* fallthrough */ case DO_START_VX001: me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_IMMUNE_TO_PC)); me->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM); @@ -1156,7 +1156,7 @@ class boss_aerial_command_unit : public CreatureScript fireFigther = true; DoCast(me, SPELL_EMERGENCY_MODE); events.ScheduleEvent(EVENT_SUMMON_FIRE_BOTS, 1000, 0, PHASE_AERIAL_COMMAND_UNIT); - // Missing break intended. + /* fallthrough */ case DO_START_AERIAL: me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_IMMUNE_TO_PC)); me->SetReactState(REACT_AGGRESSIVE); diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 26fd92db4b9..ab209d3287c 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -738,7 +738,7 @@ class instance_violet_hold : public InstanceMapScript guard->AddUnitFlag(UnitFlags(UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC)); } } - // 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 acbbb2bc802..01285e18a61 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -791,9 +791,7 @@ public: Creature* crunchy = shooter->FindNearestCreature(NPC_CRUNCHY, 30); Creature* bird = shooter->FindNearestCreature(NPC_THICKBIRD, 30); - if (!bird || !crunchy) - ; // fall to EVENT_MISS - else + if (bird && crunchy) { shooter->CastSpell(bird, SPELL_MISS_BIRD_APPLE); bird->CastSpell(bird, SPELL_BIRD_FALL); @@ -804,10 +802,10 @@ public: crunchy->GetMotionMaster()->MovePoint(0, bird->GetPositionX(), bird->GetPositionY(), bird->GetMap()->GetWaterOrGroundLevel(bird->GetPhaseShift(), bird->GetPositionX(), bird->GetPositionY(), bird->GetPositionZ())); /// @todo Make crunchy perform emote eat when he reaches the bird - 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 66600ccb4d0..21197f01c81 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -176,7 +176,7 @@ class instance_black_temple : public InstanceMapScript for (ObjectGuid ashtongueGuid : AshtongueGUIDs) if (Creature* ashtongue = instance->GetCreature(ashtongueGuid)) ashtongue->SetFaction(ASHTONGUE_FACTION_FRIEND); - // no break + /* 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 1c03c169efd..b413d805e0f 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -59,7 +59,7 @@ class instance_gruuls_lair : public InstanceMapScript { case NPC_MAULGAR: MaulgarGUID = creature->GetGUID(); - // no break; + /* 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 d0fabf1dd5b..8d52d7dd09b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -86,7 +86,7 @@ class instance_blood_furnace : public InstanceMapScript { case GO_PRISON_DOOR_04: PrisonDoor4GUID = go->GetGUID(); - // no break + /* 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 7f3aab941af..3a065b246ac 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); + break; } } } |