diff --git a/src/common/network/IpNetwork.cpp b/src/common/network/IpNetwork.cpp index b6235a5a9..2a5bc1b66 100644 --- a/src/common/network/IpNetwork.cpp +++ b/src/common/network/IpNetwork.cpp @@ -48,7 +48,7 @@ bool IsInLocalNetwork(boost::asio::ip::address const& clientAddress) } return false; -}; +} bool IsInNetwork(boost::asio::ip::network_v4 const& network, boost::asio::ip::address_v4 const& clientAddress) { diff --git a/src/server/database/Database/MySQLThreading.h b/src/server/database/Database/MySQLThreading.h index 6e75bdee9..4888395e5 100644 --- a/src/server/database/Database/MySQLThreading.h +++ b/src/server/database/Database/MySQLThreading.h @@ -25,6 +25,6 @@ namespace MySQL TC_DATABASE_API void Library_Init(); TC_DATABASE_API void Library_End(); TC_DATABASE_API uint32 GetLibraryVersion(); -}; +} #endif diff --git a/src/server/game/Achievements/CriteriaHandler.cpp b/src/server/game/Achievements/CriteriaHandler.cpp index ec897f5cf..3ed364585 100644 --- a/src/server/game/Achievements/CriteriaHandler.cpp +++ b/src/server/game/Achievements/CriteriaHandler.cpp @@ -4757,7 +4757,7 @@ T GetEntry(std::unordered_map const& map, CriteriaTreeEntry const* tr return nullptr; return itr->second; -}; +} void CriteriaMgr::LoadCriteriaList() { diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index a21bb9432..fef413375 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -157,7 +157,7 @@ class TC_GAME_API Creature : public Unit, public GridObject, public Ma bool CanOnlySwimIfTargetSwims() const { return _staticFlags.HasFlag(CREATURE_STATIC_FLAG_4_AI_WILL_ONLY_SWIM_IF_TARGET_SWIMS); } bool CanSwim() const override; - bool CanEnterWater() const override { return (CanSwim() || IsAmphibious()); }; + bool CanEnterWater() const override { return (CanSwim() || IsAmphibious()); } bool CanFly() const override { return (IsFlying() || HasUnitMovementFlag(MOVEMENTFLAG_CAN_FLY)); } MovementGeneratorType GetDefaultMovementType() const override; diff --git a/src/server/game/Entities/Taxi/TaxiPathGraph.h b/src/server/game/Entities/Taxi/TaxiPathGraph.h index a100ec291..69a1f3c2d 100644 --- a/src/server/game/Entities/Taxi/TaxiPathGraph.h +++ b/src/server/game/Entities/Taxi/TaxiPathGraph.h @@ -29,6 +29,6 @@ namespace TaxiPathGraph void Initialize(); std::size_t GetCompleteNodeRoute(TaxiNodesEntry const* from, TaxiNodesEntry const* to, Player const* player, std::vector& shortestPath); void GetReachableNodesMask(TaxiNodesEntry const* from, TaxiMask* mask); -}; +} #endif /* TAXIPATHGRAPH_HPP */ diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index ebfdd7e69..61c9335f2 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -484,8 +484,8 @@ class TC_GAME_API HealInfo uint32 GetOriginalHeal() const { return _originalHeal; } uint32 GetEffectiveHeal() const { return _effectiveHeal; } uint32 GetAbsorb() const { return _absorb; } - SpellInfo const* GetSpellInfo() const { return _spellInfo; }; - SpellSchoolMask GetSchoolMask() const { return _schoolMask; }; + SpellInfo const* GetSpellInfo() const { return _spellInfo; } + SpellSchoolMask GetSchoolMask() const { return _schoolMask; } uint32 GetHitMask() const; }; @@ -1501,7 +1501,7 @@ class TC_GAME_API Unit : public WorldObject ShapeshiftForm GetShapeshiftForm() const { return ShapeshiftForm(*m_unitData->ShapeshiftForm); } void SetShapeshiftForm(ShapeshiftForm form); void CancelShapeshiftForm(bool onlyTravelShapeshiftForm = false, AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT, bool force = false); - void CancelTravelShapeshiftForm(AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT, bool force = false) { CancelShapeshiftForm(true, removeMode, force); }; + void CancelTravelShapeshiftForm(AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT, bool force = false) { CancelShapeshiftForm(true, removeMode, force); } bool IsInFeralForm() const; diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h index 8c1ce2d56..ea9d5165a 100644 --- a/src/server/game/Globals/ObjectAccessor.h +++ b/src/server/game/Globals/ObjectAccessor.h @@ -109,6 +109,6 @@ namespace ObjectAccessor void RemoveObject(Player* player); TC_GAME_API void SaveAllPlayers(); -}; +} #endif diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index c97f5437d..a4e15fe16 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -3063,7 +3063,7 @@ uint32 FillMaxDurability(uint32 itemClass, uint32 itemSubClass, uint32 inventory } return 5 * uint32(round(18.0f * qualityMultipliers[quality] * weaponMultipliers[itemSubClass] * levelPenalty)); -}; +} struct ItemSpecStats { diff --git a/src/server/game/Grids/GridStates.h b/src/server/game/Grids/GridStates.h index af1a1aebd..99b24f9e8 100644 --- a/src/server/game/Grids/GridStates.h +++ b/src/server/game/Grids/GridStates.h @@ -26,7 +26,7 @@ class Map; class TC_GAME_API GridState { public: - virtual ~GridState() { }; + virtual ~GridState() { } virtual void Update(Map &, NGridType&, GridInfo &, uint32 t_diff) const = 0; }; diff --git a/src/server/game/Groups/GroupMgr.h b/src/server/game/Groups/GroupMgr.h index dc30b8b27..58951339b 100644 --- a/src/server/game/Groups/GroupMgr.h +++ b/src/server/game/Groups/GroupMgr.h @@ -45,7 +45,7 @@ public: uint32 GenerateNewGroupDbStoreId(); void RegisterGroupDbStoreId(uint32 storageId, Group* group); void FreeGroupDbStoreId(Group* group); - void SetNextGroupDbStoreId(uint32 storageId) { NextGroupDbStoreId = storageId; }; + void SetNextGroupDbStoreId(uint32 storageId) { NextGroupDbStoreId = storageId; } Group* GetGroupByDbStoreId(uint32 storageId) const; void SetGroupDbStoreSize(uint32 newSize); diff --git a/src/server/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h index 14afdf639..68b4bfe66 100644 --- a/src/server/game/Maps/MapUpdater.h +++ b/src/server/game/Maps/MapUpdater.h @@ -33,7 +33,7 @@ class TC_GAME_API MapUpdater public: MapUpdater() : _cancelationToken(false), pending_requests(0) {} - ~MapUpdater() { }; + ~MapUpdater() { } friend class MapUpdateRequest; diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h index 9f0666cc7..ca276c549 100644 --- a/src/server/game/Reputation/ReputationMgr.h +++ b/src/server/game/Reputation/ReputationMgr.h @@ -116,7 +116,7 @@ class TC_GAME_API ReputationMgr ReputationRank GetRank(FactionEntry const* factionEntry) const; ReputationRank GetBaseRank(FactionEntry const* factionEntry) const; - std::string GetReputationRankName(FactionEntry const* factionEntry) const;; + std::string GetReputationRankName(FactionEntry const* factionEntry) const; ReputationRank const* GetForcedRankIfAny(FactionTemplateEntry const* factionTemplateEntry) const; ReputationRank const* GetForcedRankIfAny(uint32 factionId) const; diff --git a/src/server/game/Server/Packets/QuestPackets.cpp b/src/server/game/Server/Packets/QuestPackets.cpp index b1aafff7b..700deb9d4 100644 --- a/src/server/game/Server/Packets/QuestPackets.cpp +++ b/src/server/game/Server/Packets/QuestPackets.cpp @@ -264,7 +264,7 @@ WorldPacket const* QuestUpdateAddCredit::Write() _worldPacket << uint32(ObjectiveType); return &_worldPacket; -}; +} WorldPacket const* QuestUpdateAddCreditSimple::Write() { @@ -432,7 +432,7 @@ WorldPacket const* QuestGiverOfferRewardMessage::Write() _worldPacket << SizedString::Data(PortraitTurnInName); return &_worldPacket; -}; +} void QuestGiverChooseReward::Read() { diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index e63e84ca2..462e6e667 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -2763,7 +2763,7 @@ void SpellInfo::_LoadAuraState() SpellSpecificType SpellInfo::GetSpellSpecific() const { return _spellSpecific; -}; +} void SpellInfo::_LoadSpellSpecific() { diff --git a/src/server/game/Weather/Weather.h b/src/server/game/Weather/Weather.h index 8ee8f9921..e35fcd2ae 100644 --- a/src/server/game/Weather/Weather.h +++ b/src/server/game/Weather/Weather.h @@ -67,7 +67,7 @@ class TC_GAME_API Weather public: Weather(uint32 zoneId, WeatherData const* weatherChances); - ~Weather() { }; + ~Weather() { } bool Update(uint32 diff); bool ReGenerate(); @@ -79,7 +79,7 @@ class TC_GAME_API Weather WeatherState GetWeatherState() const; /// For which zone is this weather? - uint32 GetZone() const { return m_zone; }; + uint32 GetZone() const { return m_zone; } uint32 GetScriptId() const { return m_weatherChances->ScriptId; } private: diff --git a/src/server/scripts/Battlegrounds/IsleOfConquest/boss_ioc_horde_alliance.cpp b/src/server/scripts/Battlegrounds/IsleOfConquest/boss_ioc_horde_alliance.cpp index 05a13de84..3d02a2386 100644 --- a/src/server/scripts/Battlegrounds/IsleOfConquest/boss_ioc_horde_alliance.cpp +++ b/src/server/scripts/Battlegrounds/IsleOfConquest/boss_ioc_horde_alliance.cpp @@ -53,7 +53,7 @@ struct boss_ioc_horde_alliance : public ScriptedAI me->GetCreatureListWithEntryInGrid(guardsList, _npcGuard, 100.0f); for (std::list::const_iterator itr = guardsList.begin(); itr != guardsList.end(); ++itr) (*itr)->Respawn(); - }; + } void JustEngagedWith(Unit* /*who*/) override { diff --git a/src/server/scripts/Battlegrounds/TwinPeaks/battleground_twin_peaks.cpp b/src/server/scripts/Battlegrounds/TwinPeaks/battleground_twin_peaks.cpp index f71cf0e50..609e777de 100644 --- a/src/server/scripts/Battlegrounds/TwinPeaks/battleground_twin_peaks.cpp +++ b/src/server/scripts/Battlegrounds/TwinPeaks/battleground_twin_peaks.cpp @@ -47,7 +47,7 @@ namespace TwinPeaks static constexpr uint32 Gate2 = 208207; static constexpr uint32 Gate3 = 208206; static constexpr uint32 Portcullis = 203710; - static constexpr uint32 HordeFlag = 227740;; + static constexpr uint32 HordeFlag = 227740; static constexpr uint32 AllianceFlag = 227741; static constexpr uint32 WildHammerGate1 = 206653; static constexpr uint32 WildHammerGate2 = 206654; diff --git a/src/server/scripts/BrokenIsles/zone_mardum.cpp b/src/server/scripts/BrokenIsles/zone_mardum.cpp index adba190c0..e3da96fd0 100644 --- a/src/server/scripts/BrokenIsles/zone_mardum.cpp +++ b/src/server/scripts/BrokenIsles/zone_mardum.cpp @@ -759,7 +759,7 @@ CreatureAI* KaynSunfuryNearLegionBannerAISelector(Creature* creature) if (creature->IsPrivateObject()) return new npc_kayn_sunfury_ashtongue_intro_private(creature); return new npc_kayn_sunfury_ashtongue_intro(creature); -}; +} // 1053 - Enter the Illidari: Ashtongue class scene_enter_the_illidari_ashtongue : public SceneScript @@ -829,7 +829,7 @@ CreatureAI* SevisBrightflameAshtongueGatewayAISelector(Creature* creature) if (creature->IsPrivateObject()) return new npc_sevis_brightflame_ashtongue_gateway_private(creature); return new NullCreatureAI(creature); -}; +} // 200255 - Accepting Felsaber Gift class spell_accepting_felsaber_gift : public SpellScript @@ -934,7 +934,7 @@ CreatureAI* SevisBrightflameCoilskarGatewayAISelector(Creature* creature) if (creature->IsPrivateObject()) return new npc_sevis_brightflame_coilskar_gateway_private(creature); return new NullCreatureAI(creature); -}; +} enum EyeOnThePrizeData { @@ -1255,7 +1255,7 @@ CreatureAI* CyanaNightglaiveFreedAISelector(Creature* creature) if (creature->IsPrivateObject()) return new npc_cyana_nightglaive_freed_private(creature); return new NullCreatureAI(creature); -}; +} // 93117 - Izal Whitemoon struct npc_izal_whitemoon_freed_private : public ScriptedAI @@ -1291,7 +1291,7 @@ CreatureAI* IzalWhitemoonFreedAISelector(Creature* creature) if (creature->IsPrivateObject()) return new npc_izal_whitemoon_freed_private(creature); return new NullCreatureAI(creature); -}; +} // 94400 - Belath Dawnblade struct npc_belath_dawnblade_freed_private : public ScriptedAI @@ -1327,7 +1327,7 @@ CreatureAI* BelathDawnbladeFreedAISelector(Creature* creature) if (creature->IsPrivateObject()) return new npc_belath_dawnblade_freed_private(creature); return new NullCreatureAI(creature); -}; +} // 93230 - Mannethrel Darkstar struct npc_mannethrel_darkstar_freed_private : public ScriptedAI @@ -1364,7 +1364,7 @@ CreatureAI* MannethrelDarkstarFreedAISelector(Creature* creature) if (creature->IsPrivateObject()) return new npc_mannethrel_darkstar_freed_private(creature); return new NullCreatureAI(creature); -}; +} // 204711 - Set Them Free: Cyana Nightglaive Freed Kill Credit // 204714 - Set Them Free: Izal Whitemoon Freed Kill Credit @@ -1873,7 +1873,7 @@ CreatureAI* JayceDarkweaverCrypticHollowAISelector(Creature* creature) if (creature->IsPrivateObject()) return new npc_jayce_darkweaver_cryptic_hollow_private(creature); return new npc_jayce_darkweaver_cryptic_hollow(creature); -}; +} struct npc_basic_hidden_no_more_private : public ScriptedAI { @@ -1922,7 +1922,7 @@ CreatureAI* BasicHiddenNoMoreAISelector(Creature* creature) if (creature->IsPrivateObject()) return new npc_basic_hidden_no_more_private(creature); return new NullCreatureAI(creature); -}; +} // 101787 - Demon Hunter // 101788 - Demon Hunter @@ -1969,7 +1969,7 @@ CreatureAI* DemonHunterHiddenNoMoreAISelector(Creature* creature) if (creature->IsPrivateObject()) return new npc_demon_hunter_hidden_no_more_private(creature); return new NullCreatureAI(creature); -}; +} enum FelLordCazaData { @@ -2311,4 +2311,4 @@ void AddSC_zone_mardum() RegisterSpellScript(spell_fel_lord_caza_throwing_axe_selector); RegisterSpellScript(spell_fel_lord_caza_dies_02); RegisterSpellScript(spell_fel_lord_caza_disarmed); -}; +} diff --git a/src/server/scripts/Draenor/zone_assault_on_the_dark_portal.cpp b/src/server/scripts/Draenor/zone_assault_on_the_dark_portal.cpp index 6f9ceedd9..8fcc410d2 100644 --- a/src/server/scripts/Draenor/zone_assault_on_the_dark_portal.cpp +++ b/src/server/scripts/Draenor/zone_assault_on_the_dark_portal.cpp @@ -453,4 +453,4 @@ void AddSC_assault_on_the_dark_portal() RegisterCreatureAI(npc_altar_altercation_blood_ritual_orb); RegisterAreaTriggerAI(at_altar_altercation_kilrogg_talk); RegisterAreaTriggerAI(at_altar_altercation_reach_altar); -}; +} diff --git a/src/server/scripts/Draenor/zone_draenor_shadowmoon_valley.cpp b/src/server/scripts/Draenor/zone_draenor_shadowmoon_valley.cpp index 6be135945..199cfa3ff 100644 --- a/src/server/scripts/Draenor/zone_draenor_shadowmoon_valley.cpp +++ b/src/server/scripts/Draenor/zone_draenor_shadowmoon_valley.cpp @@ -73,4 +73,4 @@ struct npc_baros_alexston : public ScriptedAI void AddSC_draenor_shadowmoon_valley() { RegisterCreatureAI(npc_baros_alexston); -}; +} diff --git a/src/server/scripts/Draenor/zone_frostfire_ridge.cpp b/src/server/scripts/Draenor/zone_frostfire_ridge.cpp index c0213766d..ee24befb1 100644 --- a/src/server/scripts/Draenor/zone_frostfire_ridge.cpp +++ b/src/server/scripts/Draenor/zone_frostfire_ridge.cpp @@ -60,4 +60,4 @@ struct go_master_surveyor : public GameObjectAI void AddSC_frostfire_ridge() { RegisterGameObjectAI(go_master_surveyor); -}; +} diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 723b0e36f..fb5f70c5a 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -249,7 +249,7 @@ class boss_selin_fireheart : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { return GetMagistersTerraceAI(creature); - }; + } }; class npc_fel_crystal : public CreatureScript @@ -275,7 +275,7 @@ class npc_fel_crystal : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { return GetMagistersTerraceAI(creature); - }; + } }; void AddSC_boss_selin_fireheart() diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index e0f929f12..e0e89421b 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -177,7 +177,7 @@ class boss_vexallus : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { return GetMagistersTerraceAI(creature); - }; + } }; enum NpcPureEnergy @@ -210,7 +210,7 @@ class npc_pure_energy : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { return GetMagistersTerraceAI(creature); - }; + } }; void AddSC_boss_vexallus() diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index 2a73f5b5c..b9c9ddf44 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -191,7 +191,7 @@ public: } break; } - }; + } void UseStatue(GameObject* go) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index e4b535730..2fd484a20 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -317,7 +317,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { return GetSunwellPlateauAI(creature); - }; + } }; class boss_alythess : public CreatureScript @@ -641,7 +641,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { return GetSunwellPlateauAI(creature); - }; + } }; class npc_shadow_image : public CreatureScript @@ -652,7 +652,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { return GetSunwellPlateauAI(creature); - }; + } struct npc_shadow_imageAI : public ScriptedAI { diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index c9917a24a..f3fbb61af 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -152,7 +152,7 @@ class at_twilight_grove : public AreaTriggerScript corrupter->AI()->Talk(YELL_TWILIGHT_CORRUPTOR_RESPAWN, player); return false; - }; + } }; void AddSC_duskwood() diff --git a/src/server/scripts/ExilesReach/zone_exiles_reach.cpp b/src/server/scripts/ExilesReach/zone_exiles_reach.cpp index b1e20aae6..a78d686fc 100644 --- a/src/server/scripts/ExilesReach/zone_exiles_reach.cpp +++ b/src/server/scripts/ExilesReach/zone_exiles_reach.cpp @@ -1030,7 +1030,7 @@ CreatureAI* CaptainGarrickAISelector(Creature* creature) } return new NullCreatureAI(creature); -}; +} enum SpellCrashLandedData { @@ -1276,7 +1276,7 @@ CreatureAI* CaptainGarrickBeachAISelector(Creature* creature) } } return new npc_captain_garrick_beach(creature); -}; +} CreatureAI* WarlordGrimaxeBeachAISelector(Creature* creature) { @@ -1291,7 +1291,7 @@ CreatureAI* WarlordGrimaxeBeachAISelector(Creature* creature) } } return new npc_warlord_grimaxe_beach(creature); -}; +} enum HealedByLeaderBeachData { @@ -1365,14 +1365,14 @@ CreatureAI* HealedByLeaderAllianceAISelector(Creature* creature) if (creature->IsPrivateObject()) return new npc_survivors_healed_by_leader_beach_private(creature); return new NullCreatureAI(creature); -}; +} CreatureAI* HealedByLeaderHordeAISelector(Creature* creature) { if (creature->IsPrivateObject()) return new npc_survivors_healed_by_leader_beach_private(creature); return new NullCreatureAI(creature); -}; +} enum ExilesReachAllianceSurvivorsBeachData { @@ -1626,7 +1626,7 @@ CreatureAI* BoBeachStandingAISelector(Creature* creature) } return new NullCreatureAI(creature); -}; +} CreatureAI* MithdranBeachStandingAISelector(Creature* creature) { @@ -1642,7 +1642,7 @@ CreatureAI* MithdranBeachStandingAISelector(Creature* creature) } return new NullCreatureAI(creature); -}; +} CreatureAI* LanaJordanBeachStandingAISelector(Creature* creature) { @@ -1658,28 +1658,28 @@ CreatureAI* LanaJordanBeachStandingAISelector(Creature* creature) } return new NullCreatureAI(creature); -}; +} CreatureAI* KeeLaBeachStandingAISelector(Creature* creature) { if (creature->IsPrivateObject()) return new npc_survivors_beach_leave_private(creature); return new NullCreatureAI(creature); -}; +} CreatureAI* BjornBeachStandingAISelector(Creature* creature) { if (creature->IsPrivateObject()) return new npc_survivors_beach_leave_private(creature); return new NullCreatureAI(creature); -}; +} CreatureAI* AustinBeachStandingAISelector(Creature* creature) { if (creature->IsPrivateObject()) return new npc_survivors_beach_leave_private(creature); return new NullCreatureAI(creature); -}; +} enum LostExpeditionFollowerData { @@ -3364,7 +3364,7 @@ CreatureAI* SparringPartnerEnhancedCombatTrainingSelector(Creature* creature) if (creature->IsPrivateObject()) return new npc_survivors_beach_leave_private(creature); return new NullCreatureAI(creature); -}; +} struct at_aggro_radius_check_enhanced_combat_tactics : AreaTriggerAI { @@ -4118,7 +4118,7 @@ CreatureAI* HuxsworthBriarpatchSelector(Creature* creature) } } return new NullCreatureAI(creature); -}; +} CreatureAI* DawntrackerBriarpatchSelector(Creature* creature) { @@ -4133,7 +4133,7 @@ CreatureAI* DawntrackerBriarpatchSelector(Creature* creature) } } return new NullCreatureAI(creature); -}; +} // 316840 - Tutorial - Health (DNT) class spell_tutorial_health_dnt_proc_aura : public AuraScript @@ -4869,7 +4869,7 @@ CreatureAI* LindieSpringstockSelector(Creature* creature) } } return new NullCreatureAI(creature); -}; +} CreatureAI* CorkFizzlepopSelector(Creature* creature) { @@ -4882,7 +4882,7 @@ CreatureAI* CorkFizzlepopSelector(Creature* creature) } } return new NullCreatureAI(creature); -}; +} enum CopterRideData { @@ -5128,7 +5128,7 @@ CreatureAI* ChoppyBoosterSelector(Creature* creature) return new npc_choppy_booster_scout(creature); } return new NullCreatureAI(creature); -}; +} // 167909 - Won'sa // 167910 - Bo @@ -5151,7 +5151,7 @@ CreatureAI* HordeCrewPlainsSelector(Creature* creature) return new npc_horde_crew_plains_private(creature); return new NullCreatureAI(creature); -}; +} static constexpr Position CopterCloneSpawnPosition = { 100.583f, -2417.87f, 90.268f, 0.0f }; @@ -6418,7 +6418,7 @@ CreatureAI* PrisonerQ55879Selector(Creature* creature) return new npc_prisoner_q55879_private(creature); else return new NullCreatureAI(creature); -}; +} enum TheReDeather { @@ -6793,7 +6793,7 @@ CreatureAI* BjornRuinsSelector(Creature* creature) return new npc_bjorn_stouthands_q55965_private(creature); else return new NullCreatureAI(creature); -}; +} enum LanaRunToPit { @@ -6857,7 +6857,7 @@ CreatureAI* LanaRuinsSelector(Creature* creature) return new npc_lana_jordan_q59948_private(creature); else return new NullCreatureAI(creature); -}; +} enum CompanionRunToPit { @@ -6910,7 +6910,7 @@ CreatureAI* AlariaRuinsSelector(Creature* creature) return new npc_companion_q55965_q59948_private(creature); else return new NullCreatureAI(creature); -}; +} CreatureAI* WansaRuinsSelector(Creature* creature) { @@ -6918,7 +6918,7 @@ CreatureAI* WansaRuinsSelector(Creature* creature) return new npc_companion_q55965_q59948_private(creature); else return new NullCreatureAI(creature); -}; +} void AddSC_zone_exiles_reach() { @@ -7049,4 +7049,4 @@ void AddSC_zone_exiles_reach() new FactoryCreatureScript("npc_lana_jordan_q59948"); new FactoryCreatureScript("npc_alaria_q55965"); new FactoryCreatureScript("npc_wonsa_q59948"); -}; +} diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp index b59e43a40..64668e887 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -836,4 +836,4 @@ void AddSC_boss_baleroc() RegisterSpellScript(spell_baleroc_vital_spark); RegisterSpellScript(spell_baleroc_vital_flame); new achievement_share_the_pain(); -}; +} diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 50938720b..ed171ecb0 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -928,7 +928,7 @@ public: CheckEventFail(); if (WaveCount == 4 || Failed) EnterEvadeMode(); - }; + } }; }; diff --git a/src/server/scripts/KhazAlgar/campaign_visions_of_a_shadowed_sun.cpp b/src/server/scripts/KhazAlgar/campaign_visions_of_a_shadowed_sun.cpp index 85ccfb9eb..91964a3eb 100644 --- a/src/server/scripts/KhazAlgar/campaign_visions_of_a_shadowed_sun.cpp +++ b/src/server/scripts/KhazAlgar/campaign_visions_of_a_shadowed_sun.cpp @@ -183,7 +183,7 @@ CreatureAI* VereesaWindrunnerOztanIsleAISelector(Creature* creature) if (creature->IsPrivateObject()) return new npc_vereesa_windrunner_oztan_isle_private(creature); return new npc_vereesa_windrunner_oztan_isle(creature); -}; +} // 27493 - Conversation: Vereesas Tale class conversation_vereesas_tale : public ConversationAI diff --git a/src/server/scripts/KulTiras/Drustvar/drustvar_chapter_3_an_airtight_alibi.cpp b/src/server/scripts/KulTiras/Drustvar/drustvar_chapter_3_an_airtight_alibi.cpp index b91093208..1022f2f58 100644 --- a/src/server/scripts/KulTiras/Drustvar/drustvar_chapter_3_an_airtight_alibi.cpp +++ b/src/server/scripts/KulTiras/Drustvar/drustvar_chapter_3_an_airtight_alibi.cpp @@ -129,7 +129,7 @@ CreatureAI* FrightendWoodsmanAISelector(Creature* creature) if (creature->IsPrivateObject()) return new npc_drustvar_frightend_woodsman_private(creature); return new npc_drustvar_frightend_woodsman(creature); -}; +} void AddSC_drustvar_chapter_3_an_airtight_alibi() { diff --git a/src/server/scripts/KulTiras/WaycrestManor/boss_heartsbane_triad.cpp b/src/server/scripts/KulTiras/WaycrestManor/boss_heartsbane_triad.cpp index aa1da6bf8..8e8e20666 100644 --- a/src/server/scripts/KulTiras/WaycrestManor/boss_heartsbane_triad.cpp +++ b/src/server/scripts/KulTiras/WaycrestManor/boss_heartsbane_triad.cpp @@ -199,7 +199,7 @@ struct HeartsbaneTriadSharedAI : public BossAI virtual void ScheduleEvents() { events.ScheduleEvent(EVENT_CHECK_POWER, 1000ms); - }; + } virtual void HandleDropIris(bool /*skipShieldPhase*/, bool /*skipIrisDrop*/) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 98068756c..55977dc57 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -638,7 +638,7 @@ public: { DoCast(me, SPELL_EARTH_SHIELD); DoCast(who, SPELL_HEX_OF_MENDING); - }; + } void JustReachedHome() override { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 9a2fe5e89..1fffbcb72 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -628,7 +628,7 @@ struct npc_gothik_minion_baseAI : public ScriptedAI _UpdateAI(diff); } - virtual void _UpdateAI(uint32 diff) { ScriptedAI::UpdateAI(diff); }; + virtual void _UpdateAI(uint32 diff) { ScriptedAI::UpdateAI(diff); } private: uint32 _deathNotify; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index a39b6aa64..6232a7284 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -363,7 +363,7 @@ struct npc_ruby_emerald_amber_drake : public VehicleAI break; } } - }; + } private: InstanceScript* _instance; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index e06c49c65..73daed276 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -1628,7 +1628,7 @@ class FlameLeviathanPursuedTargetSelector }; public: - explicit FlameLeviathanPursuedTargetSelector() { }; + explicit FlameLeviathanPursuedTargetSelector() { } bool operator()(WorldObject* target) const { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 1f8ffc6da..7d7dd8c11 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -550,7 +550,7 @@ class boss_hodir : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); - }; + } }; class npc_icicle : public CreatureScript @@ -603,7 +603,7 @@ class npc_icicle : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); - }; + } }; class npc_snowpacked_icicle : public CreatureScript @@ -648,7 +648,7 @@ class npc_snowpacked_icicle : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); - }; + } }; class npc_hodir_priest : public CreatureScript @@ -732,7 +732,7 @@ class npc_hodir_priest : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); - }; + } }; class npc_hodir_shaman : public CreatureScript @@ -798,7 +798,7 @@ class npc_hodir_shaman : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); - }; + } }; class npc_hodir_druid : public CreatureScript @@ -863,7 +863,7 @@ class npc_hodir_druid : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); - }; + } }; class npc_hodir_mage : public CreatureScript @@ -948,7 +948,7 @@ class npc_hodir_mage : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); - }; + } }; class npc_toasty_fire : public CreatureScript @@ -982,7 +982,7 @@ class npc_toasty_fire : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); - }; + } }; // 62038 - Biting Cold diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h index 386eb7c1b..c49753853 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h @@ -78,7 +78,7 @@ enum UKGameObjectIds struct ForgeInfo { - ForgeInfo() : Event(NOT_STARTED) { }; + ForgeInfo() : Event(NOT_STARTED) { } ObjectGuid AnvilGUID; ObjectGuid BellowGUID; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp index 027dcc852..67d9fd527 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp @@ -30,7 +30,7 @@ Position const Executioner = { 152.8524f, -83.63912f, 2.021005f, 0.06981317f }; class at_nethekurse_exit : public AreaTriggerScript { public: - at_nethekurse_exit() : AreaTriggerScript("at_nethekurse_exit") { }; + at_nethekurse_exit() : AreaTriggerScript("at_nethekurse_exit") { } bool OnTrigger(Player* player, AreaTriggerEntry const*) override { @@ -75,7 +75,7 @@ class boss_shattered_executioner : public CreatureScript boss_shattered_executionerAI(Creature* creature) : BossAI(creature, DATA_SHATTERED_EXECUTIONER) { Initialize(); - }; + } void Initialize() { diff --git a/src/server/scripts/Pandaria/zone_the_wandering_isle.cpp b/src/server/scripts/Pandaria/zone_the_wandering_isle.cpp index b56986b24..e97abce2b 100644 --- a/src/server/scripts/Pandaria/zone_the_wandering_isle.cpp +++ b/src/server/scripts/Pandaria/zone_the_wandering_isle.cpp @@ -1492,7 +1492,7 @@ class spell_flying_shadow_kick : public SpellScript OnEffectHitTarget += SpellEffectFn(spell_flying_shadow_kick::HandleHitTarget, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; -}; +} void AddSC_zone_the_wandering_isle() { diff --git a/src/server/scripts/Zandalar/Underrot/boss_cragmaw_the_infested.cpp b/src/server/scripts/Zandalar/Underrot/boss_cragmaw_the_infested.cpp index 163cc8112..8ad739ca6 100644 --- a/src/server/scripts/Zandalar/Underrot/boss_cragmaw_the_infested.cpp +++ b/src/server/scripts/Zandalar/Underrot/boss_cragmaw_the_infested.cpp @@ -162,7 +162,7 @@ struct boss_cragmaw_the_infested : public BossAI { if (spell->Id == SPELL_TANTRUM_INITIAL) me->SetReactState(REACT_AGGRESSIVE); - }; + } void UpdateAI(uint32 diff) override {