From 22c843d8fe4097ea5af53f4deb137886626b199a Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sat, 9 Dec 2023 02:34:48 +0100 Subject: [PATCH] Scripts/Kalimdor: moved scipts into their corresponding namespace --- .../BlackfathomDeeps/blackfathom_deeps.cpp | 4 + .../BlackfathomDeeps/blackfathom_deeps.h | 3 + .../BlackfathomDeeps/boss_aku_mai.cpp | 5 ++ .../BlackfathomDeeps/boss_gelihast.cpp | 5 ++ .../Kalimdor/BlackfathomDeeps/boss_kelris.cpp | 5 ++ .../instance_blackfathom_deeps.cpp | 4 + .../BattleForMountHyjal/boss_anetheron.cpp | 7 ++ .../BattleForMountHyjal/boss_archimonde.cpp | 5 ++ .../BattleForMountHyjal/boss_azgalor.cpp | 6 ++ .../BattleForMountHyjal/boss_kazrogal.cpp | 6 ++ .../boss_rage_winterchill.cpp | 7 ++ .../BattleForMountHyjal/hyjal.cpp | 6 ++ .../CavernsOfTime/BattleForMountHyjal/hyjal.h | 3 + .../BattleForMountHyjal/hyjalAI.cpp | 5 ++ .../BattleForMountHyjal/hyjalAI.h | 3 + .../BattleForMountHyjal/hyjal_trash.cpp | 5 ++ .../BattleForMountHyjal/hyjal_trash.h | 3 + .../BattleForMountHyjal/instance_hyjal.cpp | 4 + .../boss_chrono_lord_epoch.cpp | 5 ++ .../boss_infinite_corruptor.cpp | 85 ++++++++++--------- .../CullingOfStratholme/boss_mal_ganis.cpp | 5 ++ .../CullingOfStratholme/boss_meathook.cpp | 5 ++ .../boss_salramm_the_fleshcrafter.cpp | 5 ++ .../culling_of_stratholme.cpp | 4 + .../culling_of_stratholme.h | 13 ++- .../instance_culling_of_stratholme.cpp | 8 +- .../CullingOfStratholme/npc_arthas.cpp | 5 ++ .../DragonSoul/boss_madness_of_deathwing.cpp | 5 ++ .../CavernsOfTime/DragonSoul/dragon_soul.h | 3 + .../DragonSoul/instance_dragon_soul.cpp | 4 + .../EndTime/boss_echo_of_jaina.cpp | 5 ++ .../CavernsOfTime/EndTime/boss_murozond.cpp | 5 ++ .../CavernsOfTime/EndTime/end_time.cpp | 4 + .../Kalimdor/CavernsOfTime/EndTime/end_time.h | 3 + .../EndTime/instance_end_time.cpp | 4 + .../boss_captain_skarloc.cpp | 5 ++ .../boss_epoch_hunter.cpp | 5 ++ .../boss_leutenant_drake.cpp | 5 ++ .../instance_old_hillsbrad.cpp | 4 + .../EscapeFromDurnholdeKeep/old_hillsbrad.cpp | 4 + .../EscapeFromDurnholdeKeep/old_hillsbrad.h | 3 + .../HourOfTwilight/hour_of_twilight.h | 3 + .../instance_hour_of_twilight.cpp | 4 + .../TheBlackMorass/boss_aeonus.cpp | 5 ++ .../TheBlackMorass/boss_chrono_lord_deja.cpp | 4 + .../TheBlackMorass/boss_temporus.cpp | 5 ++ .../instance_the_black_morass.cpp | 4 + .../TheBlackMorass/the_black_morass.cpp | 4 + .../TheBlackMorass/the_black_morass.h | 3 + .../instance_well_of_eternity.cpp | 4 + .../WellOfEternity/well_of_eternity.h | 53 ++++++------ .../Kalimdor/DireMaul/instance_dire_maul.cpp | 4 + .../Kalimdor/Firelands/boss_alysrazor.cpp | 5 ++ .../Kalimdor/Firelands/boss_baleroc.cpp | 5 ++ .../Kalimdor/Firelands/boss_lord_rhyolith.cpp | 5 ++ .../Firelands/boss_majordomo_staghelm.cpp | 5 ++ .../Firelands/boss_ragnaros_firelands.cpp | 5 ++ .../scripts/Kalimdor/Firelands/firelands.cpp | 4 + .../scripts/Kalimdor/Firelands/firelands.h | 3 + .../Kalimdor/Firelands/instance_firelands.cpp | 4 + .../HallsOfOrigination/boss_ammunae.cpp | 5 ++ .../HallsOfOrigination/boss_anraphet.cpp | 5 ++ .../boss_earthrager_ptah.cpp | 5 ++ .../HallsOfOrigination/boss_isiset.cpp | 5 ++ .../Kalimdor/HallsOfOrigination/boss_rajh.cpp | 5 ++ .../HallsOfOrigination/boss_setesh.cpp | 5 ++ .../boss_temple_guardian_anhuur.cpp | 5 ++ .../halls_of_origination.cpp | 4 + .../HallsOfOrigination/halls_of_origination.h | 4 +- .../instance_halls_of_origination.cpp | 4 + .../boss_general_husam.cpp | 5 ++ .../boss_high_prophet_barim.cpp | 5 ++ .../boss_lockmaw_and_augh.cpp | 5 ++ .../LostCityOfTheTolvir/boss_siamat.cpp | 5 ++ .../instance_lost_city_of_the_tolvir.cpp | 4 + .../lost_city_of_the_tolvir.cpp | 4 + .../lost_city_of_the_tolvir.h | 4 +- .../Maraudon/boss_celebras_the_cursed.cpp | 5 ++ .../Kalimdor/Maraudon/boss_landslide.cpp | 5 ++ .../Kalimdor/Maraudon/boss_noxxion.cpp | 5 ++ .../Maraudon/boss_princess_theradras.cpp | 5 ++ .../Kalimdor/Maraudon/instance_maraudon.cpp | 4 + .../Kalimdor/OnyxiasLair/boss_onyxia.cpp | 5 ++ .../OnyxiasLair/instance_onyxias_lair.cpp | 4 + .../Kalimdor/OnyxiasLair/onyxias_lair.h | 3 + .../RagefireChasm/instance_ragefire_chasm.cpp | 4 + .../Kalimdor/RagefireChasm/ragefire_chasm.h | 3 + .../boss_amnennar_the_coldbringer.cpp | 5 ++ .../Kalimdor/RazorfenDowns/boss_glutton.cpp | 5 ++ .../RazorfenDowns/boss_mordresh_fire_eye.cpp | 5 ++ .../RazorfenDowns/boss_tuten_kash.cpp | 5 ++ .../RazorfenDowns/instance_razorfen_downs.cpp | 4 + .../Kalimdor/RazorfenDowns/razorfen_downs.cpp | 4 + .../Kalimdor/RazorfenDowns/razorfen_downs.h | 3 + .../RazorfenKraul/instance_razorfen_kraul.cpp | 4 + .../Kalimdor/RazorfenKraul/razorfen_kraul.cpp | 4 + .../Kalimdor/RazorfenKraul/razorfen_kraul.h | 4 + .../Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp | 5 ++ .../Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp | 5 ++ .../RuinsOfAhnQiraj/boss_kurinnaxx.cpp | 5 ++ .../Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp | 5 ++ .../RuinsOfAhnQiraj/boss_ossirian.cpp | 5 ++ .../Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp | 5 ++ .../instance_ruins_of_ahnqiraj.cpp | 4 + .../RuinsOfAhnQiraj/ruins_of_ahnqiraj.h | 3 + .../TempleOfAhnQiraj/boss_bug_trio.cpp | 5 ++ .../Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp | 5 ++ .../TempleOfAhnQiraj/boss_fankriss.cpp | 5 ++ .../TempleOfAhnQiraj/boss_huhuran.cpp | 5 ++ .../Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp | 5 ++ .../TempleOfAhnQiraj/boss_sartura.cpp | 5 ++ .../Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp | 5 ++ .../TempleOfAhnQiraj/boss_twinemperors.cpp | 5 ++ .../TempleOfAhnQiraj/boss_viscidus.cpp | 5 ++ .../instance_temple_of_ahnqiraj.cpp | 4 + .../mob_anubisath_sentinel.cpp | 5 ++ .../TempleOfAhnQiraj/temple_of_ahnqiraj.h | 3 + .../ThroneOfTheFourWinds/boss_alakir.cpp | 5 ++ .../boss_conclave_of_wind.cpp | 5 ++ .../instance_throne_of_the_four_winds.cpp | 4 + .../throne_of_the_four_winds.cpp | 4 + .../throne_of_the_four_winds.h | 3 + .../Kalimdor/VortexPinnacle/boss_altairus.cpp | 5 ++ .../Kalimdor/VortexPinnacle/boss_asaad.cpp | 5 ++ .../boss_grand_vizier_ertan.cpp | 5 ++ .../instance_vortex_pinnacle.cpp | 4 + .../VortexPinnacle/vortex_pinnacle.cpp | 4 + .../Kalimdor/VortexPinnacle/vortex_pinnacle.h | 3 + .../Kalimdor/WailingCaverns/boss_kresh.cpp | 6 +- .../WailingCaverns/boss_lady_anacondra.cpp | 5 +- .../WailingCaverns/boss_lord_cobrahn.cpp | 6 +- .../WailingCaverns/boss_lord_pythas.cpp | 6 +- .../WailingCaverns/boss_lord_serpentis.cpp | 6 +- .../Kalimdor/WailingCaverns/boss_skum.cpp | 5 +- .../boss_verdan_the_everliving.cpp | 6 +- .../instance_wailing_caverns.cpp | 4 + .../WailingCaverns/wailing_caverns.cpp | 4 + .../Kalimdor/WailingCaverns/wailing_caverns.h | 3 + .../Kalimdor/ZulFarrak/boss_zum_rah.cpp | 4 + .../Kalimdor/ZulFarrak/instance_zulfarrak.cpp | 4 + .../scripts/Kalimdor/ZulFarrak/zulfarrak.cpp | 4 + .../scripts/Kalimdor/ZulFarrak/zulfarrak.h | 3 + .../scripts/Kalimdor/zone_ashenvale.cpp | 4 + .../scripts/Kalimdor/zone_azuremyst_isle.cpp | 4 + .../scripts/Kalimdor/zone_bloodmyst_isle.cpp | 4 + src/server/scripts/Kalimdor/zone_desolace.cpp | 4 + src/server/scripts/Kalimdor/zone_durotar.cpp | 4 + src/server/scripts/Kalimdor/zone_felwood.cpp | 4 + .../scripts/Kalimdor/zone_moonglade.cpp | 4 + .../scripts/Kalimdor/zone_mount_hyjal.cpp | 4 + src/server/scripts/Kalimdor/zone_mulgore.cpp | 4 + .../Kalimdor/zone_northern_barrens.cpp | 4 + src/server/scripts/Kalimdor/zone_silithus.cpp | 4 + .../Kalimdor/zone_southern_barrens.cpp | 4 + src/server/scripts/Kalimdor/zone_tanaris.cpp | 4 + .../scripts/Kalimdor/zone_thunder_bluff.cpp | 4 + src/server/scripts/Kalimdor/zone_uldum.cpp | 4 + .../scripts/Kalimdor/zone_ungoro_crater.cpp | 7 +- .../scripts/Kalimdor/zone_winterspring.cpp | 4 + 159 files changed, 772 insertions(+), 80 deletions(-) diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index c6b7ee93d1..0bb7ca0fe1 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -25,6 +25,8 @@ #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" +namespace BlackfathomDeeps +{ enum Spells { SPELL_BLESSING_OF_BLACKFATHOM = 8733, @@ -256,9 +258,11 @@ public: return GetBlackfathomDeepsAI(creature); } }; +} void AddSC_blackfathom_deeps() { + using namespace BlackfathomDeeps; new go_blackfathom_altar(); new go_blackfathom_fire(); new npc_blackfathom_deeps_event(); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h index 1645c51d6b..88bb40aa20 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace BlackfathomDeeps +{ #define BFDScriptName "instance_blackfathom_deeps" #define DataHeader "BFD" @@ -75,5 +77,6 @@ inline AI* GetBlackfathomDeepsAI(T* obj) { return GetInstanceAI(obj, BFDScriptName); } +} #endif // BFD_H_ diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index a7475cd39b..9e47551ac5 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp @@ -19,6 +19,8 @@ #include "blackfathom_deeps.h" #include "ScriptedCreature.h" +namespace BlackfathomDeeps::AkuMai +{ enum Spells { SPELL_POISON_CLOUD = 3815, @@ -91,8 +93,11 @@ public: return GetBlackfathomDeepsAI(creature); } }; +} void AddSC_boss_aku_mai() { + using namespace BlackfathomDeeps; + using namespace BlackfathomDeeps::AkuMai; new boss_aku_mai(); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp index c19a8288b3..7ce8f05bca 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp @@ -19,6 +19,8 @@ #include "blackfathom_deeps.h" #include "ScriptedCreature.h" +namespace BlackfathomDeeps::Gelihast +{ enum Spells { SPELL_NET = 6533 @@ -69,8 +71,11 @@ public: return GetBlackfathomDeepsAI(creature); } }; +} void AddSC_boss_gelihast() { + using namespace BlackfathomDeeps; + using namespace BlackfathomDeeps::Gelihast; new boss_gelihast(); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index c6b2dd338e..dd7e95bbc8 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -19,6 +19,8 @@ #include "blackfathom_deeps.h" #include "ScriptedCreature.h" +namespace BlackfathomDeeps::Kelris +{ enum Spells { SPELL_MIND_BLAST = 15587, @@ -104,8 +106,11 @@ public: return GetBlackfathomDeepsAI(creature); } }; +} void AddSC_boss_kelris() { + using namespace BlackfathomDeeps; + using namespace BlackfathomDeeps::Kelris; new boss_kelris(); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index 794a67d0c2..aa7f9838d6 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -29,6 +29,8 @@ EndScriptData */ #include "InstanceScript.h" #include "Map.h" +namespace BlackfathomDeeps +{ const Position LorgusPosition[4] = { { -458.500610f, -38.343079f, -33.474445f, 0.0f }, @@ -241,8 +243,10 @@ public: return new instance_blackfathom_deeps_InstanceMapScript(map); } }; +} void AddSC_instance_blackfathom_deeps() { + using namespace BlackfathomDeeps; new instance_blackfathom_deeps(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index d4b71da074..c5e57202a7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -21,6 +21,10 @@ #include "ObjectAccessor.h" #include "SpellScript.h" +namespace BattleForMountHyjal::Anetheron +{ +using namespace BattleForMountHyjal::Trash; + enum Spells { SPELL_CARRION_SWARM = 31306, @@ -294,9 +298,12 @@ class spell_anetheron_vampiric_aura : public SpellScriptLoader return new spell_anetheron_vampiric_aura_AuraScript(); } }; +} void AddSC_boss_anetheron() { + using namespace BattleForMountHyjal; + using namespace BattleForMountHyjal::Anetheron; new boss_anetheron(); new npc_towering_infernal(); new spell_anetheron_vampiric_aura(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 265d9db561..c6976db730 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -31,6 +31,8 @@ EndScriptData */ #include "ScriptedCreature.h" #include "SpellScript.h" +namespace BattleForMountHyjal::Archimonde +{ enum Texts { SAY_AGGRO = 1, @@ -566,9 +568,12 @@ class spell_archimonde_drain_world_tree_dummy : public SpellScriptLoader return new spell_archimonde_drain_world_tree_dummy_SpellScript(); } }; +} void AddSC_boss_archimonde() { + using namespace BattleForMountHyjal; + using namespace BattleForMountHyjal::Archimonde; new boss_archimonde(); new npc_doomfire(); new npc_doomfire_targetting(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 85de6a6a2f..43ab0fed01 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -21,6 +21,9 @@ #include "ObjectAccessor.h" #include "ScriptedCreature.h" +namespace BattleForMountHyjal::Azgalor +{ +using namespace BattleForMountHyjal::Trash; enum Spells { SPELL_RAIN_OF_FIRE = 31340, @@ -271,9 +274,12 @@ public: return GetHyjalAI(creature); } }; +} void AddSC_boss_azgalor() { + using namespace BattleForMountHyjal; + using namespace BattleForMountHyjal::Azgalor; new boss_azgalor(); new npc_lesser_doomguard(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index bbda2d3e2c..b228446781 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -23,6 +23,9 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" +namespace BattleForMountHyjal::Kazrogal +{ +using namespace BattleForMountHyjal::Trash; enum Spells { SPELL_CLEAVE = 31436, @@ -233,9 +236,12 @@ class spell_mark_of_kazrogal : public SpellScriptLoader return new spell_mark_of_kazrogal_AuraScript(); } }; +} void AddSC_boss_kazrogal() { + using namespace BattleForMountHyjal; + using namespace BattleForMountHyjal::Kazrogal; new boss_kazrogal(); new spell_mark_of_kazrogal(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index d8660a8209..10b1b281f3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -20,6 +20,10 @@ #include "InstanceScript.h" #include "ObjectAccessor.h" +namespace BattleForMountHyjal::RageWinterchill +{ +using namespace BattleForMountHyjal::Trash; + enum Spells { SPELL_FROST_ARMOR = 31256, @@ -162,8 +166,11 @@ public: return GetHyjalAI(creature); } }; +} void AddSC_boss_rage_winterchill() { + using namespace BattleForMountHyjal; + using namespace BattleForMountHyjal::RageWinterchill; new boss_rage_winterchill(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index ef33aba715..a827c6c3fe 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -36,6 +36,10 @@ EndContentData */ #include "ScriptedCreature.h" #include "ScriptedGossip.h" +namespace BattleForMountHyjal +{ +using namespace BattleForMountHyjal::HyjalAI; + #define GOSSIP_ITEM_BEGIN_ALLY "My companions and I are with you, Lady Proudmoore." #define GOSSIP_ITEM_ANETHERON "We are ready for whatever Archimonde might send our way, Lady Proudmoore." @@ -251,9 +255,11 @@ class npc_tyrande_whisperwind : public CreatureScript return GetHyjalAI(creature); } }; +} void AddSC_hyjal() { + using namespace BattleForMountHyjal; new npc_jaina_proudmoore(); new npc_thrall(); new npc_tyrande_whisperwind(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h index ad4ea550da..652353238c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace BattleForMountHyjal +{ #define HyjalScriptName "instance_hyjal" #define DataHeader "HY" @@ -100,5 +102,6 @@ inline AI* GetHyjalAI(T* obj) { return GetInstanceAI(obj, HyjalScriptName); } +} #endif diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 35e9b2d274..0abd87f280 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -33,6 +33,10 @@ EndScriptData */ #include "ObjectAccessor.h" #include "TemporarySummon.h" +namespace BattleForMountHyjal::HyjalAI +{ +using namespace BattleForMountHyjal::Trash; + enum Spawns { SPAWN_GARG_GATE = 0, @@ -1106,3 +1110,4 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) break; } } +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h index 331c04b606..87914c2405 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h @@ -21,6 +21,8 @@ #include "hyjal.h" #include "ScriptedEscortAI.h" +namespace BattleForMountHyjal::HyjalAI +{ #define HYJAL_AI_MAX_SPELLS 3 enum SpellIds @@ -204,4 +206,5 @@ struct hyjalAI : public EscortAI private: uint32 SpellTimer[3]; }; +} #endif diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 511895f5ed..5cdaac0fba 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -23,6 +23,8 @@ #include "ObjectAccessor.h" #include "TemporarySummon.h" +namespace BattleForMountHyjal::Trash +{ enum Spells { SPELL_METEOR = 33814, //infernal visual @@ -1442,9 +1444,12 @@ public: return GetHyjalAI(creature); } }; +} void AddSC_hyjal_trash() { + using namespace BattleForMountHyjal; + using namespace BattleForMountHyjal::Trash; new npc_giant_infernal(); new npc_abomination(); new npc_ghoul(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h index fa48cb4271..d5dddfbb2a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h @@ -21,6 +21,8 @@ #include "hyjal.h" #include "ScriptedEscortAI.h" +namespace BattleForMountHyjal::Trash +{ struct hyjal_trashAI : public EscortAI { hyjal_trashAI(Creature* creature); @@ -46,4 +48,5 @@ struct hyjal_trashAI : public EscortAI //private: }; +} #endif diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 7ae37bda96..aa1c5f67db 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -42,6 +42,8 @@ EndScriptData */ 4 - Archimonde event */ +namespace BattleForMountHyjal +{ enum Yells { YELL_ARCHIMONDE_INTRO = 8 @@ -321,8 +323,10 @@ public: return new instance_mount_hyjal_InstanceMapScript(map); } }; +} void AddSC_instance_mount_hyjal() { + using namespace BattleForMountHyjal; new instance_hyjal(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp index 20c0259ecb..8053cadee6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp @@ -23,6 +23,8 @@ #include "SpellInfo.h" #include +namespace CullingOfStratholme::ChronoLordEpoch +{ enum Spells { SPELL_CURSE_OF_EXERTION = 52772, @@ -157,8 +159,11 @@ class boss_epoch : public CreatureScript return GetCullingOfStratholmeAI(creature); } }; +} void AddSC_boss_epoch() { + using namespace CullingOfStratholme; + using namespace CullingOfStratholme::ChronoLordEpoch; new boss_epoch(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp index e01b6afb38..4b1a72f95a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp @@ -22,40 +22,42 @@ #include "ScriptMgr.h" #include "SpellInfo.h" -enum Spells +namespace CullingOfStratholme::InfiniteCorruptor { - SPELL_CORRUPTING_BLIGHT = 60588, - SPELL_VOID_STRIKE = 60590, - SPELL_CORRUPTION_OF_TIME_CHANNEL = 60422, - SPELL_CORRUPTION_OF_TIME_TARGET = 60451 -}; + enum Spells + { + SPELL_CORRUPTING_BLIGHT = 60588, + SPELL_VOID_STRIKE = 60590, + SPELL_CORRUPTION_OF_TIME_CHANNEL = 60422, + SPELL_CORRUPTION_OF_TIME_TARGET = 60451 + }; -enum Yells -{ - SAY_AGGRO = 0, - SAY_DEATH = 1, - SAY_FAIL = 2 -}; + enum Yells + { + SAY_AGGRO = 0, + SAY_DEATH = 1, + SAY_FAIL = 2 + }; -enum Events -{ - EVENT_CORRUPTING_BLIGHT = 1, - EVENT_VOID_STRIKE -}; + enum Events + { + EVENT_CORRUPTING_BLIGHT = 1, + EVENT_VOID_STRIKE + }; -enum Entries -{ - NPC_TIME_RIFT = 28409, - NPC_GUARDIAN_OF_TIME = 32281 -}; + enum Entries + { + NPC_TIME_RIFT = 28409, + NPC_GUARDIAN_OF_TIME = 32281 + }; -enum Misc -{ - MOVEMENT_TIME_RIFT = 1 -}; + enum Misc + { + MOVEMENT_TIME_RIFT = 1 + }; -class boss_infinite_corruptor : public CreatureScript -{ + class boss_infinite_corruptor : public CreatureScript + { public: boss_infinite_corruptor() : CreatureScript("boss_infinite_corruptor") { } @@ -102,17 +104,17 @@ class boss_infinite_corruptor : public CreatureScript { switch (eventId) { - case EVENT_CORRUPTING_BLIGHT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) - DoCast(target, SPELL_CORRUPTING_BLIGHT); - events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 15s); - break; - case EVENT_VOID_STRIKE: - DoCastVictim(SPELL_VOID_STRIKE); - events.ScheduleEvent(EVENT_VOID_STRIKE, 5s); - break; - default: - break; + case EVENT_CORRUPTING_BLIGHT: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + DoCast(target, SPELL_CORRUPTING_BLIGHT); + events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 15s); + break; + case EVENT_VOID_STRIKE: + DoCastVictim(SPELL_VOID_STRIKE); + events.ScheduleEvent(EVENT_VOID_STRIKE, 5s); + break; + default: + break; } } @@ -155,9 +157,12 @@ class boss_infinite_corruptor : public CreatureScript { return GetCullingOfStratholmeAI(creature); } -}; + }; +} void AddSC_boss_infinite_corruptor() { + using namespace CullingOfStratholme; + using namespace CullingOfStratholme::InfiniteCorruptor; new boss_infinite_corruptor(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index 7f7dba252c..0c6a4cad4d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -26,6 +26,8 @@ #include "ScriptMgr.h" #include "SpellMgr.h" +namespace CullingOfStratholme::MalGanis +{ enum Spells { SPELL_CARRION_SWARM = 52720, @@ -190,8 +192,11 @@ class boss_mal_ganis : public CreatureScript bool _hadYell15; }; }; +} void AddSC_boss_mal_ganis() { + using namespace CullingOfStratholme; + using namespace CullingOfStratholme::MalGanis; new boss_mal_ganis(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 72a4ee2e1d..0075d35cbd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -20,6 +20,8 @@ #include "ScriptedCreature.h" #include "ScriptMgr.h" +namespace CullingOfStratholme::Meathook +{ enum Spells { SPELL_CONSTRICTING_CHAINS = 52696, @@ -112,8 +114,11 @@ class boss_meathook : public CreatureScript return GetCullingOfStratholmeAI(creature); } }; +} void AddSC_boss_meathook() { + using namespace CullingOfStratholme; + using namespace CullingOfStratholme::Meathook; new boss_meathook(); } 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 31ad9e0bee..dfdc74ac87 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 @@ -22,6 +22,8 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" +namespace CullingOfStratholme::SalrammTheFleshcrafter +{ enum Spells { SPELL_CURSE_OF_TWISTED_FLESH = 58845, @@ -152,9 +154,12 @@ class spell_salramm_steal_flesh : public AuraScript OnEffectPeriodic.Register(&spell_salramm_steal_flesh::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; +} void AddSC_boss_salramm() { + using namespace CullingOfStratholme; + using namespace CullingOfStratholme::SalrammTheFleshcrafter; new boss_salramm(); RegisterSpellScript(spell_salramm_steal_flesh); } 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 182120bf5d..171ae04556 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -36,6 +36,8 @@ #include "TemporarySummon.h" #include +namespace CullingOfStratholme +{ enum InnEventEntries { NPC_FORREST = 30551, @@ -1457,9 +1459,11 @@ public: return GetCullingOfStratholmeAI(creature); } }; +} void AddSC_culling_of_stratholme() { + using namespace CullingOfStratholme; new npc_hearthsinger_forresten_cot(); new at_stratholme_inn_stairs_cot(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h index a4ead46b8a..d3a8256a3d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h @@ -20,6 +20,10 @@ #include "CreatureAIImpl.h" +struct Position; + +namespace CullingOfStratholme +{ #define DataHeader "CS" #define CoSScriptName "instance_culling_of_stratholme" @@ -83,8 +87,6 @@ uint32 constexpr EncounterCount = 5; * - gets current instance state using GetData, then checks if we should despawn ourselves (bitmask check) * \***********************************************************************************************************************/ -struct Position; - // Note: These are bitmask values to allow combining, but only a single bit will ever be true in instance script enum COSProgressStates : uint32 { @@ -109,7 +111,11 @@ enum COSProgressStates : uint32 ALL = 0x1FFFF }; COSProgressStates GetStableStateFor(COSProgressStates const state); // defined by instance script -Position const& GetArthasSnapbackFor(COSProgressStates state); // defined by arthas script + +namespace Arthas +{ + Position const& GetArthasSnapbackFor(COSProgressStates state); // defined by arthas script +} enum COSInstanceData { @@ -172,5 +178,6 @@ inline AI* GetCullingOfStratholmeAI(T* obj) { return GetInstanceAI(obj, CoSScriptName); } +} #endif diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index 94bc68ae2a..f55d3e488f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -35,6 +35,8 @@ #include #include +namespace CullingOfStratholme +{ /* * Culling of Stratholme encounters: * 0 - Meathook @@ -400,7 +402,7 @@ class instance_culling_of_stratholme : public InstanceMapScript case DATA_GM_RECALL: { Creature* arthas = instance->GetCreature(_arthasGUID); - Position const& target = arthas ? arthas->GetPosition() : GetArthasSnapbackFor(_currentState); + Position const& target = arthas ? arthas->GetPosition() : Arthas::GetArthasSnapbackFor(_currentState); for (auto itr = instance->GetPlayers().begin(); itr != instance->GetPlayers().end(); ++itr) { @@ -517,7 +519,7 @@ class instance_culling_of_stratholme : public InstanceMapScript } case EVENT_RESPAWN_ARTHAS: TC_LOG_DEBUG("scripts.cos", "instance_culling_of_stratholme::Update: Spawning new Arthas for instance..."); - instance->SummonCreature(NPC_ARTHAS, GetArthasSnapbackFor(_currentState)); + instance->SummonCreature(NPC_ARTHAS, Arthas::GetArthasSnapbackFor(_currentState)); events.CancelEvent(EVENT_RESPAWN_ARTHAS); // make sure we don't have two scheduled break; case EVENT_CRIER_CALL_TO_GATES: @@ -820,8 +822,10 @@ class instance_culling_of_stratholme : public InstanceMapScript return new instance_culling_of_stratholme_InstanceMapScript(map); } }; +} void AddSC_instance_culling_of_stratholme() { + using namespace CullingOfStratholme; new instance_culling_of_stratholme(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp index 8b77efcf84..2eb714027b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp @@ -38,6 +38,8 @@ #include #include +namespace CullingOfStratholme::Arthas +{ enum Entries { NPC_MALGANIS_BUNNY = 20562, @@ -1680,9 +1682,12 @@ class spell_stratholme_crusader_strike : public SpellScript OnEffectHitTarget.Register(&spell_stratholme_crusader_strike::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; +} void AddSC_npc_arthas_stratholme() { + using namespace CullingOfStratholme; + using namespace CullingOfStratholme::Arthas; new npc_arthas_stratholme(); RegisterCreatureAI(npc_stratholme_rp_dummy); RegisterSpellScript(spell_stratholme_crusader_strike); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp index f92b43d4d5..d52a3380c1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp @@ -40,6 +40,8 @@ #include +namespace DragonSoul::MadnessOfDeathwing +{ enum Texts { // Deathwing @@ -2605,9 +2607,12 @@ public: return true; } }; +} void AddSC_boss_madness_of_deathwing() { + using namespace DragonSoul; + using namespace DragonSoul::MadnessOfDeathwing; RegisterDragonSoulCreatureAI(boss_madness_of_deathwing); RegisterDragonSoulCreatureAI(npc_madness_of_deathwing_limb_tentacle); RegisterDragonSoulCreatureAI(npc_madness_of_deathwing_mutated_corruption); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/dragon_soul.h b/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/dragon_soul.h index 2322613e35..3b5c09098f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/dragon_soul.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/dragon_soul.h @@ -22,6 +22,8 @@ #include "Creature.h" #include "CreatureAIImpl.h" +namespace DragonSoul +{ #define DataHeader "DS" #define DSScriptName "instance_dragon_soul" @@ -115,5 +117,6 @@ AI* GetDragonSoulAI(Creature* creature) } #define RegisterDragonSoulCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetDragonSoulAI) +} #endif // DEF_DRAGONSOUL_H diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/instance_dragon_soul.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/instance_dragon_soul.cpp index e564603b9f..1e30aaa23e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/instance_dragon_soul.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/instance_dragon_soul.cpp @@ -20,6 +20,8 @@ #include "ScriptMgr.h" #include "dragon_soul.h" +namespace DragonSoul +{ ObjectData const creatureData[] = { { BOSS_MADNESS_OF_DEATHWING, DATA_MADNESS_OF_DEATHWING }, @@ -87,8 +89,10 @@ public: return new instance_dragon_soul_InstanceMapScript(map); } }; +} void AddSC_instance_dragon_soul() { + using namespace DragonSoul; new instance_dragon_soul(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_echo_of_jaina.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_echo_of_jaina.cpp index e2b477ed2d..d8a04bea4b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_echo_of_jaina.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_echo_of_jaina.cpp @@ -26,6 +26,8 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" +namespace EndTime::EchoOfJaina +{ enum Spells { // Echo of Jaina @@ -466,9 +468,12 @@ class spell_echo_of_jaina_flarecore_periodic : public AuraScript AfterEffectRemove.Register(&spell_echo_of_jaina_flarecore_periodic::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; +} void AddSC_boss_echo_of_jaina() { + using namespace EndTime; + using namespace EndTime::EchoOfJaina; RegisterEndTimeCreatureAI(boss_echo_of_jaina); RegisterEndTimeCreatureAI(npc_echo_of_jaina_blink_target); RegisterSpellScript(spell_echo_of_jaina_face_highest_threat_target); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_murozond.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_murozond.cpp index 9083b5565e..69defa9e82 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_murozond.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_murozond.cpp @@ -37,6 +37,8 @@ TODO List: #include "SpellScript.h" #include "TemporarySummon.h" +namespace EndTime::Murozond +{ enum Spells { // Murozond @@ -523,9 +525,12 @@ class spell_murozond_clone_master_health : public SpellScript OnEffectHitTarget.Register(&spell_murozond_clone_master_health::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; +} void AddSC_boss_murozond() { + using namespace EndTime; + using namespace EndTime::Murozond; RegisterEndTimeCreatureAI(boss_murozond); RegisterEndTimeCreatureAI(npc_murozond_mirror_image); RegisterSpellScript(spell_murozond_rewind_time_forcecast); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/end_time.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/end_time.cpp index 8eb8419a9d..240c2495fc 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/end_time.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/end_time.cpp @@ -25,6 +25,8 @@ #include "ScriptedGossip.h" #include "ScriptMgr.h" +namespace EndTime +{ enum Events { // Nozdormu @@ -245,9 +247,11 @@ struct go_end_time_fragment_of_jainas_staff : public GameObjectAI private: InstanceScript* _instance; }; +} void AddSC_end_time() { + using namespace EndTime; RegisterEndTimeCreatureAI(npc_end_time_nozdormu); RegisterGameObjectAI(go_end_time_time_transit_device); RegisterGameObjectAI(go_end_time_fragment_of_jainas_staff); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/end_time.h b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/end_time.h index 8c14385b73..e06b97f166 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/end_time.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/end_time.h @@ -23,6 +23,8 @@ class Creature; +namespace EndTime +{ #define DataHeader "ET" #define ETScriptName "instance_end_time" @@ -75,5 +77,6 @@ AI* GetEndTimeAI(Creature* creature) } #define RegisterEndTimeCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetEndTimeAI) +} #endif // DEF_ENDTIME_H diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/instance_end_time.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/instance_end_time.cpp index c01404eb85..49b4a28f6e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/instance_end_time.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/instance_end_time.cpp @@ -25,6 +25,8 @@ #include +namespace EndTime +{ ObjectData const creatureData[] = { { BOSS_MUROZOND, DATA_MUROZOND }, @@ -264,8 +266,10 @@ public: return new instance_end_time_InstanceMapScript(map); } }; +} void AddSC_instance_end_time() { + using namespace EndTime; new instance_end_time(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index 57d033fd97..5c97746382 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -27,6 +27,8 @@ EndScriptData */ #include "old_hillsbrad.h" #include "ScriptedCreature.h" +namespace EscapeFromDurnholdeKeep::CaptainSkarloc +{ /*###################### # boss_captain_skarloc # #######################*/ @@ -161,8 +163,11 @@ public: return GetOldHillsbradAI(creature); } }; +} void AddSC_boss_captain_skarloc() { + using namespace EscapeFromDurnholdeKeep; + using namespace EscapeFromDurnholdeKeep::CaptainSkarloc; new boss_captain_skarloc(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index fd2e86425a..86e814db9a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -27,6 +27,8 @@ EndScriptData */ #include "old_hillsbrad.h" #include "ScriptedCreature.h" +namespace EscapeFromDurnholdeKeep::EpochHunter +{ /*################### # boss_epoch_hunter # ####################*/ @@ -143,8 +145,11 @@ public: return GetOldHillsbradAI(creature); } }; +} void AddSC_boss_epoch_hunter() { + using namespace EscapeFromDurnholdeKeep; + using namespace EscapeFromDurnholdeKeep::EpochHunter; new boss_epoch_hunter(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index 304a811264..04fc47d98b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -30,6 +30,8 @@ EndScriptData */ #include "old_hillsbrad.h" #include "ScriptedEscortAI.h" +namespace EscapeFromDurnholdeKeep::LeutenantDrake +{ /*###### ## go_barrel_old_hillsbrad ######*/ @@ -199,9 +201,12 @@ public: return GetOldHillsbradAI(creature); } }; +} void AddSC_boss_lieutenant_drake() { + using namespace EscapeFromDurnholdeKeep; + using namespace EscapeFromDurnholdeKeep::LeutenantDrake; new go_barrel_old_hillsbrad(); new boss_lieutenant_drake(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index c93f78507f..3313753e19 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -30,6 +30,8 @@ EndScriptData */ #include "Player.h" #include "ScriptedCreature.h" +namespace EscapeFromDurnholdeKeep +{ #define MAX_ENCOUNTER 6 #define THRALL_ENTRY 17876 @@ -233,8 +235,10 @@ public: return new instance_old_hillsbrad_InstanceMapScript(map); } }; +} void AddSC_instance_old_hillsbrad() { + using namespace EscapeFromDurnholdeKeep; new instance_old_hillsbrad(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 5dddb78f23..90fd1f3b59 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -37,6 +37,8 @@ EndContentData */ #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" +namespace EscapeFromDurnholdeKeep +{ enum Erozion { QUEST_ENTRY_HILLSBRAD = 10282, @@ -649,6 +651,7 @@ public: return GetOldHillsbradAI(creature); } }; +} /*###### ## AddSC @@ -656,6 +659,7 @@ public: void AddSC_old_hillsbrad() { + using namespace EscapeFromDurnholdeKeep; new npc_erozion(); new npc_thrall_old_hillsbrad(); new npc_taretha(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h index 882b2e398b..e2d2a7936d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace EscapeFromDurnholdeKeep +{ #define OHScriptName "instance_old_hillsbrad" #define DataHeader "OH" @@ -48,5 +50,6 @@ inline AI* GetOldHillsbradAI(T* obj) { return GetInstanceAI(obj, OHScriptName); } +} #endif diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/HourOfTwilight/hour_of_twilight.h b/src/server/scripts/Kalimdor/CavernsOfTime/HourOfTwilight/hour_of_twilight.h index e737dd51b6..42ba324828 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/HourOfTwilight/hour_of_twilight.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/HourOfTwilight/hour_of_twilight.h @@ -21,6 +21,8 @@ #include "CreatureAIImpl.h" #include "Define.h" +namespace HourOfTwilight +{ #define DataHeader "HOT" #define HOTScriptName "instance_hour_of_twilight" @@ -49,5 +51,6 @@ AI* GetHourOfTwilightAI(Creature* creature) } #define RegisterHourOfTwilightCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetHourOfTwilightAI) +} #endif // DEF_HOUROFTWILIGHT_H diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/HourOfTwilight/instance_hour_of_twilight.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/HourOfTwilight/instance_hour_of_twilight.cpp index 8760d08437..fcaa45dbc1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/HourOfTwilight/instance_hour_of_twilight.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/HourOfTwilight/instance_hour_of_twilight.cpp @@ -19,6 +19,8 @@ #include "InstanceScript.h" #include "hour_of_twilight.h" +namespace HourOfTwilight +{ ObjectData const creatureData[] = { { 0, 0 } // END @@ -55,8 +57,10 @@ public: return new instance_hour_of_twilight_InstanceMapScript(map); } }; +} void AddSC_instance_hour_of_twilight() { + using namespace HourOfTwilight; new instance_hour_of_twilight(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp index e62b3ad237..4e75a5b999 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp @@ -27,6 +27,8 @@ Category: Caverns of Time, The Dark Portal #include "ScriptedCreature.h" #include "the_black_morass.h" +namespace TheBlackMorass::Aeonus +{ enum Enums { SAY_ENTER = 0, @@ -144,8 +146,11 @@ public: return GetBlackMorassAI(creature); } }; +} void AddSC_boss_aeonus() { + using namespace TheBlackMorass; + using namespace TheBlackMorass::Aeonus; new boss_aeonus(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp index a5995b5986..f193f8a00c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp @@ -27,6 +27,8 @@ Category: Caverns of Time, The Black Morass #include "ScriptedCreature.h" #include "the_black_morass.h" +namespace TheBlackMorass::ChronoLordDeja +{ enum Enums { SAY_ENTER = 0, @@ -150,8 +152,10 @@ public: return GetBlackMorassAI(creature); } }; +} void AddSC_boss_chrono_lord_deja() { + using namespace TheBlackMorass::ChronoLordDeja; new boss_chrono_lord_deja(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp index 670cb962e7..3c89bdac81 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp @@ -27,6 +27,8 @@ Category: Caverns of Time, The Black Morass #include "ScriptedCreature.h" #include "the_black_morass.h" +namespace TheBlackMorass::Temporus +{ enum Enums { SAY_ENTER = 0, @@ -148,8 +150,11 @@ public: return GetBlackMorassAI(creature); } }; +} void AddSC_boss_temporus() { + using namespace TheBlackMorass; + using namespace TheBlackMorass::Temporus; new boss_temporus(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp index 785cc1d8b7..7e12ea99e2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp @@ -32,6 +32,8 @@ Category: Caverns of Time, The Black Morass #include "TemporarySummon.h" #include "the_black_morass.h" +namespace TheBlackMorass +{ enum Misc { SPELL_RIFT_CHANNEL = 31387, @@ -333,8 +335,10 @@ public: return new instance_the_black_morass_InstanceMapScript(map); } }; +} void AddSC_instance_the_black_morass() { + using namespace TheBlackMorass; new instance_the_black_morass(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index 77f5f5af68..aefb93daeb 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -26,6 +26,8 @@ #include "SpellInfo.h" #include "the_black_morass.h" +namespace TheBlackMorass +{ enum MedivhBm { SAY_ENTER = 0, //where does this belong? @@ -351,9 +353,11 @@ public: return GetBlackMorassAI(creature); } }; +} void AddSC_the_black_morass() { + using namespace TheBlackMorass; new npc_medivh_bm(); new npc_time_rift(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h index 16328a47d1..743d15faf4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace TheBlackMorass +{ #define TBMScriptName "instance_the_black_morass" #define DataHeader "TBM" @@ -72,5 +74,6 @@ inline AI* GetBlackMorassAI(T* obj) { return GetInstanceAI(obj, TBMScriptName); } +} #endif diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/WellOfEternity/instance_well_of_eternity.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/WellOfEternity/instance_well_of_eternity.cpp index f9b1016c99..a2e1eb81d9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/WellOfEternity/instance_well_of_eternity.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/WellOfEternity/instance_well_of_eternity.cpp @@ -19,6 +19,8 @@ #include "InstanceScript.h" #include "well_of_eternity.h" +namespace WellOfEternity +{ ObjectData const creatureData[] = { { NPC_PEROTHARN, BOSS_PEROTHARN }, @@ -59,8 +61,10 @@ public: return new instance_well_of_eternity_InstanceMapScript(map); } }; +} void AddSC_instance_well_of_eternity() { + using namespace WellOfEternity; new instance_well_of_eternity(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/WellOfEternity/well_of_eternity.h b/src/server/scripts/Kalimdor/CavernsOfTime/WellOfEternity/well_of_eternity.h index 320fad27de..f3e727d926 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/WellOfEternity/well_of_eternity.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/WellOfEternity/well_of_eternity.h @@ -21,40 +21,43 @@ #include "CreatureAIImpl.h" #include "Define.h" +namespace WellOfEternity +{ #define DataHeader "WOE" #define WOEScriptName "instance_well_of_eternity" -uint32 const EncounterCount = 3; + uint32 const EncounterCount = 3; -enum WOEDataTypes -{ - // Bosses - BOSS_PEROTHARN = 0, - BOSS_QUEEN_AZSHARA = 1, - BOSS_MANNOROTH_AND_VAROTHEN = 2, + enum WOEDataTypes + { + // Bosses + BOSS_PEROTHARN = 0, + BOSS_QUEEN_AZSHARA = 1, + BOSS_MANNOROTH_AND_VAROTHEN = 2, - // Misc - DATA_WOE_COURTYARD_DOOR01, -}; + // Misc + DATA_WOE_COURTYARD_DOOR01, + }; -enum WOECreatures -{ - NPC_PEROTHARN = 55085 -}; + enum WOECreatures + { + NPC_PEROTHARN = 55085 + }; -enum WOEGameObjectIds -{ - GO_WOE_COURTYARD_DOOR01 = 210084, - GO_LARGE_FIREWALL_DOOR = 210234, - GO_SMALL_FIREWALL_DOOR = 210130, -}; + enum WOEGameObjectIds + { + GO_WOE_COURTYARD_DOOR01 = 210084, + GO_LARGE_FIREWALL_DOOR = 210234, + GO_SMALL_FIREWALL_DOOR = 210130, + }; -template -AI* GetWellOfEternityAI(Creature* creature) -{ - return GetInstanceAI(creature, WOEScriptName); -} + template + AI* GetWellOfEternityAI(Creature* creature) + { + return GetInstanceAI(creature, WOEScriptName); + } #define RegisterWellOfEternityCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetWellOfEternityAI) +} #endif // DEF_WELLOFETERNITY_H diff --git a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp index 94ce548ab2..348b6ec775 100644 --- a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp +++ b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp @@ -48,6 +48,8 @@ gets instead the deserter debuff. // 15 - Captain Kromcrush // 16 - King Gordok +namespace DireMaul +{ uint8 const EncounterCount = 17; class instance_dire_maul : public InstanceMapScript @@ -69,8 +71,10 @@ public: } }; +} void AddSC_instance_dire_maul() { + using namespace DireMaul; new instance_dire_maul(); } diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp index 73a8d71627..2a20a86cdf 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp @@ -29,6 +29,8 @@ #include "SpellScript.h" #include "TemporarySummon.h" +namespace Firelands::Alysrazor +{ enum Texts { // Egg Pile @@ -671,9 +673,12 @@ class spell_alysrazor_fieroblast : public SpellScriptLoader return new spell_alysrazor_fieroblast_SpellScript(); } }; +} void AddSC_boss_alysrazor() { + using namespace Firelands; + using namespace Firelands::Alysrazor; new npc_harbinger_of_flame(); new npc_blazing_monstrosity(); new npc_molten_barrage(); diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp index 2423e77fea..214206d5fe 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -34,6 +34,8 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" +namespace Firelands::Baleroc +{ enum Spells { SPELL_INFERNO_BLADE = 99350, @@ -822,9 +824,12 @@ class achievement_share_the_pain : public AchievementCriteriaScript return target->GetAI()->GetData(DATA_SHARE_THE_PAIN) != 0; } }; +} void AddSC_boss_baleroc() { + using namespace Firelands; + using namespace Firelands::Baleroc; new boss_baleroc(); new npc_shard_of_torment(); diff --git a/src/server/scripts/Kalimdor/Firelands/boss_lord_rhyolith.cpp b/src/server/scripts/Kalimdor/Firelands/boss_lord_rhyolith.cpp index e3a5e78094..dc74151991 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_lord_rhyolith.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_lord_rhyolith.cpp @@ -33,6 +33,8 @@ #include "SpellAuras.h" #include "SpellAuraEffects.h" +namespace Firelands::LordRhylith +{ enum Texts { // Lord Rhyolith @@ -1369,9 +1371,12 @@ private: std::vector _elementalTargetGUIDs; uint32 _summonSpellId = 0; }; +} void AddSC_boss_lord_rhyolith() { + using namespace Firelands; + using namespace Firelands::LordRhylith; RegisterFirelandsCreatureAI(boss_lord_rhyolith); RegisterFirelandsCreatureAI(npc_rhyolith_movement_controller_lord_rhyolith); RegisterFirelandsCreatureAI(npc_rhyolith_foot); diff --git a/src/server/scripts/Kalimdor/Firelands/boss_majordomo_staghelm.cpp b/src/server/scripts/Kalimdor/Firelands/boss_majordomo_staghelm.cpp index 9981a1360e..beef4ed7fd 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_majordomo_staghelm.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_majordomo_staghelm.cpp @@ -25,6 +25,8 @@ #include "SpellScript.h" #include "SpellAuraEffects.h" +namespace Firelands::MajordomoStaghelm +{ enum Spells { // Majordomo Staghelm @@ -626,9 +628,12 @@ class spell_majordomo_staghelm_burning_orbs : public SpellScript OnEffectHitTarget.Register(&spell_majordomo_staghelm_burning_orbs::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; +} void AddSC_boss_majordomo_staghelm() { + using namespace Firelands; + using namespace Firelands::MajordomoStaghelm; RegisterFirelandsCreatureAI(boss_majordomo_staghelm); RegisterSpellScript(spell_majordomo_staghelm_form_controller); RegisterSpellScript(spell_majordomo_staghelm_clump_check); diff --git a/src/server/scripts/Kalimdor/Firelands/boss_ragnaros_firelands.cpp b/src/server/scripts/Kalimdor/Firelands/boss_ragnaros_firelands.cpp index b08b2a09dd..68f9ec9621 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_ragnaros_firelands.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_ragnaros_firelands.cpp @@ -35,6 +35,8 @@ #include "boost/container/flat_set.hpp" +namespace Firelands::RagnarosFirelands +{ enum Spells { // Ragnaros @@ -2447,9 +2449,12 @@ class spell_ragnaros_superheated : public SpellScript OnObjectAreaTargetSelect.Register(&spell_ragnaros_superheated::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); } }; +} void AddSC_boss_ragnaros_firelands() { + using namespace Firelands; + using namespace Firelands::RagnarosFirelands; RegisterFirelandsCreatureAI(boss_ragnaros_firelands); RegisterFirelandsCreatureAI(npc_ragnaros_son_of_flame); RegisterFirelandsCreatureAI(npc_ragnaros_lava_scion); diff --git a/src/server/scripts/Kalimdor/Firelands/firelands.cpp b/src/server/scripts/Kalimdor/Firelands/firelands.cpp index 4c978ba7b0..af6538346b 100644 --- a/src/server/scripts/Kalimdor/Firelands/firelands.cpp +++ b/src/server/scripts/Kalimdor/Firelands/firelands.cpp @@ -21,6 +21,8 @@ #include "Player.h" #include "ScriptMgr.h" +namespace Firelands +{ class at_fl_ragnaros_spawn : public OnlyOnceAreaTriggerScript { public: @@ -35,8 +37,10 @@ public: return true; } }; +} void AddSC_firelands() { + using namespace Firelands; new at_fl_ragnaros_spawn(); } diff --git a/src/server/scripts/Kalimdor/Firelands/firelands.h b/src/server/scripts/Kalimdor/Firelands/firelands.h index 1c48edb73b..23206177d8 100644 --- a/src/server/scripts/Kalimdor/Firelands/firelands.h +++ b/src/server/scripts/Kalimdor/Firelands/firelands.h @@ -22,6 +22,8 @@ #include "Position.h" #include +namespace Firelands +{ #define DataHeader "FL" #define FirelandsScriptName "instance_firelands" @@ -1117,5 +1119,6 @@ inline AI* GetFirelandsAI(T* obj) } #define RegisterFirelandsCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetFirelandsAI) +} #endif // FIRELANDS_H_ diff --git a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp index 16d664587b..bedb333653 100644 --- a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp +++ b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp @@ -24,6 +24,8 @@ #include "InstanceScript.h" #include "Map.h" +namespace Firelands +{ ObjectData const creatureData[] = { { BOSS_BETHTILAC, DATA_BETHTILAC }, @@ -283,8 +285,10 @@ class instance_firelands : public InstanceMapScript return new instance_firelands_InstanceScript(map); } }; +} void AddSC_instance_firelands() { + using namespace Firelands; new instance_firelands(); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp index b3aea9a58d..e7e8823a37 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp @@ -25,6 +25,8 @@ #include "SpellScript.h" #include "InstanceScript.h" +namespace HallsOfOrigination::Ammunae +{ enum Spells { // Ammunae @@ -554,9 +556,12 @@ class spell_ammunae_fixate : public SpellScript OnEffectHitTarget.Register(&spell_ammunae_fixate::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; +} void AddSC_boss_ammunae() { + using namespace HallsOfOrigination; + using namespace HallsOfOrigination::Ammunae; RegisterHallsOfOriginationCreatureAI(boss_ammunae); RegisterHallsOfOriginationCreatureAI(npc_ammunae_seedling_pod); RegisterHallsOfOriginationCreatureAI(npc_ammunae_bloodpetal_blossom); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp index e00f8b0996..a8ec8e486c 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp @@ -26,6 +26,8 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" +namespace HallsOfOrigination::Anraphet +{ enum Texts { ANRAPHET_SAY_INTRO = 0, @@ -368,9 +370,12 @@ class spell_anraphet_omega_stance_summon : public SpellScript OnEffectLaunch.Register(&spell_anraphet_omega_stance_summon::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON); } }; +} void AddSC_boss_anraphet() { + using namespace HallsOfOrigination; + using namespace HallsOfOrigination::Anraphet; RegisterHallsOfOriginationCreatureAI(boss_anraphet); RegisterHallsOfOriginationCreatureAI(npc_alpha_beam); RegisterHallsOfOriginationCreatureAI(npc_omega_stance); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index 2140568298..e9e425cd25 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -31,6 +31,8 @@ #include "ObjectAccessor.h" #include "MotionMaster.h" +namespace HallsOfOrigination::EarthRagerPtah +{ enum Texts { SAY_DEATH = 0, @@ -399,9 +401,12 @@ class achievement_straw_broke_camels_back : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_earthrager_ptah() { + using namespace HallsOfOrigination; + using namespace HallsOfOrigination::EarthRagerPtah; RegisterHallsOfOriginationCreatureAI(boss_earthrager_ptah); RegisterHallsOfOriginationCreatureAI(npc_ptah_beetle_stalker); RegisterSpellScript(spell_earthrager_ptah_flame_bolt); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp index 2c65a12b3e..c82d2ca07f 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp @@ -23,6 +23,8 @@ #include "halls_of_origination.h" #include "InstanceScript.h" +namespace HallsOfOrigination::Isiset +{ enum Spells { SPELL_SUPERNOVA = 74136, @@ -823,9 +825,12 @@ public: return new spell_isiset_call_of_sky_SpellScript(); } }; +} void AddSC_boss_isiset() { + using namespace HallsOfOrigination; + using namespace HallsOfOrigination::Isiset; new boss_isiset(); new npc_celestial_familiar(); new npc_isiset_mirror_image(); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp index 2d2b21bc3a..a9255322ae 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp @@ -26,6 +26,8 @@ #include "ObjectAccessor.h" #include "Map.h" +namespace HallsOfOrigination::Rajh +{ enum Spells { // Rajh @@ -395,9 +397,12 @@ class spell_rajh_summon_sun_orb_power_cost : public AuraScript OnEffectPeriodic.Register(&spell_rajh_summon_sun_orb_power_cost::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; +} void AddSC_boss_rajh() { + using namespace HallsOfOrigination; + using namespace HallsOfOrigination::Rajh; RegisterHallsOfOriginationCreatureAI(boss_rajh); RegisterHallsOfOriginationCreatureAI(npc_rajh_solar_winds); RegisterHallsOfOriginationCreatureAI(npc_rajh_orb_of_the_sun); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp index 3ffb0ef420..477e5f2db3 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp @@ -24,6 +24,8 @@ #include "MotionMaster.h" #include "SpellInfo.h" +namespace HallsOfOrigination::Setesh +{ enum Spells { SPELL_CHAOS_BOLT = 77069, @@ -520,9 +522,12 @@ public: return new spell_setesh_chaos_blast_SpellScript(); } }; +} void AddSC_boss_setesh() { + using namespace HallsOfOrigination; + using namespace HallsOfOrigination::Setesh; new boss_setesh(); new npc_setesh_chaos_blast(); new npc_setesh_chaos_seed(); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp index 6b38a748d4..55ba05e53d 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp @@ -30,6 +30,8 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" +namespace HallsOfOrigination::TempleGuardianAnhuur +{ enum Texts { SAY_AGGRO = 0, @@ -425,9 +427,12 @@ class spell_anhuur_burning_light_forcecast : public SpellScript OnObjectAreaTargetSelect.Register(&spell_anhuur_burning_light_forcecast::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); } }; +} void AddSC_boss_temple_guardian_anhuur() { + using namespace HallsOfOrigination; + using namespace HallsOfOrigination::TempleGuardianAnhuur; RegisterHallsOfOriginationCreatureAI(boss_temple_guardian_anhuur); RegisterGameObjectAI(go_anhuur_beacon_of_light); RegisterSpellScript(spell_anhuur_divine_reckoning); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp index 984f4a2d13..38093caecd 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp @@ -33,6 +33,8 @@ #include "TemporarySummon.h" #include "halls_of_origination.h" +namespace HallsOfOrigination +{ enum SunTouchedServant { // Texts @@ -909,9 +911,11 @@ public: return true; } }; +} void AddSC_halls_of_origination() { + using namespace HallsOfOrigination; RegisterHallsOfOriginationCreatureAI(npc_sun_touched_servant); RegisterHallsOfOriginationCreatureAI(npc_hoo_aggro_stalker_1); RegisterHallsOfOriginationCreatureAI(npc_hoo_aggro_stalker_2); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h index e4a807a911..c99431a69d 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h @@ -21,6 +21,8 @@ #include "CreatureAIImpl.h" #include "Position.h" +namespace HallsOfOrigination +{ #define DataHeader "HOO" #define HoOScriptName "instance_halls_of_origination" @@ -245,6 +247,6 @@ inline AI* GetHallsOfOriginationAI(T* obj) } #define RegisterHallsOfOriginationCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetHallsOfOriginationAI) - +} #endif // HALLS_OF_ORIGINATION_H 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 27c21524f0..0be5cb7091 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp @@ -27,6 +27,8 @@ #include "World.h" #include "TemporarySummon.h" +namespace HallsOfOrigination +{ DoorData const doorData[] = { { GO_DOODAD_ULDUM_DOOR_14, DATA_TEMPLE_GUARDIAN_ANHUUR, DOOR_TYPE_ROOM }, @@ -546,8 +548,10 @@ class instance_halls_of_origination : public InstanceMapScript return new instance_halls_of_origination_InstanceMapScript(map); } }; +} void AddSC_instance_halls_of_origination() { + using namespace HallsOfOrigination; new instance_halls_of_origination(); } diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp index aecff87273..a72ff88a4e 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp @@ -30,6 +30,8 @@ #include "Vehicle.h" #include "lost_city_of_the_tolvir.h" +namespace LostCityOfTheTolvir::GeneralHusam +{ enum Spells { // General Husam @@ -487,9 +489,12 @@ class spell_husam_land_mine_player_search_effect : public SpellScript OnEffectHitTarget.Register(&spell_husam_land_mine_player_search_effect::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; +} void AddSC_boss_general_husam() { + using namespace LostCityOfTheTolvir; + using namespace LostCityOfTheTolvir::GeneralHusam; RegisterLostCityOfTheTolvirAI(boss_general_husam); RegisterLostCityOfTheTolvirAI(npc_husam_tolvir_land_mine); RegisterLostCityOfTheTolvirAI(npc_husam_bad_intentions_target); diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp index 3b078169d4..c211f100ad 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp @@ -28,6 +28,8 @@ #include "SpellMgr.h" #include "SpellScript.h" +namespace LostCityOfTheTolvir::HighProphetBarim +{ enum Spells { // High Prophet Barim @@ -743,9 +745,12 @@ class spell_barim_repentance_stun : public AuraScript OnEffectPeriodic.Register(&spell_barim_repentance_stun::DisablePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; +} void AddSC_boss_high_prophet_barim() { + using namespace LostCityOfTheTolvir; + using namespace LostCityOfTheTolvir::HighProphetBarim; RegisterLostCityOfTheTolvirAI(boss_high_prophet_barim); RegisterLostCityOfTheTolvirAI(npc_barim_repentance); RegisterLostCityOfTheTolvirAI(npc_barim_phoenix_summoner); diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp index c060a93520..0417138707 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp @@ -24,6 +24,8 @@ #include "SpellInfo.h" #include "SpellScript.h" +namespace LostCityOfTheTolvir::Lockmaw +{ enum Texts { // Augh Boss @@ -610,9 +612,12 @@ class spell_lockmaw_random_aggro_taunt : public SpellScriptLoader return new spell_lockmaw_random_aggro_taunt_SpellScript(); } }; +} void AddSC_boss_lockmaw_and_augh() { + using namespace LostCityOfTheTolvir; + using namespace LostCityOfTheTolvir::Lockmaw; new boss_lockmaw(); new boss_augh(); new npc_lockmaw_frenzied_crocolisk(); diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp index c68f0ce84f..bf99351be3 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp @@ -25,6 +25,8 @@ #include "MotionMaster.h" #include "lost_city_of_the_tolvir.h" +namespace LostCityOfTheTolvir::Siamat +{ enum Texts { SAY_UNLEASHED = 0, @@ -640,9 +642,12 @@ class spell_siamat_lightning_charge : public AuraScript OnEffectPeriodic.Register(&spell_siamat_lightning_charge::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; +} void AddSC_boss_siamat() { + using namespace LostCityOfTheTolvir; + using namespace LostCityOfTheTolvir::Siamat; RegisterLostCityOfTheTolvirAI(boss_siamat); RegisterLostCityOfTheTolvirAI(npc_siamat_servant_of_siamat); RegisterLostCityOfTheTolvirAI(npc_siamat_minion_of_siamat); diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp index 137582d9f2..93b02417c9 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp @@ -27,6 +27,8 @@ #include "TemporarySummon.h" #include "Weather.h" +namespace LostCityOfTheTolvir +{ enum TimedEvents { EVENT_SPAWN_AUGH = 1 @@ -307,8 +309,10 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript return new instance_lost_city_of_the_tolvir_InstanceMapScript(map); } }; +} void AddSC_instance_lost_city_of_the_tolvir() { + using namespace LostCityOfTheTolvir; new instance_lost_city_of_the_tolvir(); } diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.cpp index c11178b169..ec12c51149 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.cpp @@ -21,6 +21,8 @@ #include "ScriptMgr.h" #include "ObjectAccessor.h" +namespace LostCityOfTheTolvir +{ enum Texts { SAY_AGGRO = 0, @@ -194,9 +196,11 @@ struct npc_lct_wind_tunnel : public ScriptedAI private: EventMap _events; }; +} void AddSC_lost_city_of_the_tolvir() { + using namespace LostCityOfTheTolvir; new npc_lct_augh(); RegisterCreatureAI(npc_lct_wind_tunnel_landing_zone); RegisterCreatureAI(npc_lct_wind_tunnel); diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h index c4616baf11..744ceda3c4 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace LostCityOfTheTolvir +{ #define LCTScriptName "instance_lost_city_of_the_tolvir" #define DataHeader "LCT" @@ -113,5 +115,5 @@ inline AI* GetLostCityOfTheTolvirAI(T* obj) } #define RegisterLostCityOfTheTolvirAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetLostCityOfTheTolvirAI) - +} #endif // LOST_CITY_OF_THE_TOLVIR_H_ diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index fbfd30b28d..08b6d16b6d 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -25,6 +25,8 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" +namespace Maraudon::CelebrasTheCursed +{ enum Spells { SPELL_WRATH = 21807, @@ -107,8 +109,11 @@ public: } }; }; +} void AddSC_boss_celebras_the_cursed() { + using namespace Maraudon; + using namespace Maraudon::CelebrasTheCursed; new celebras_the_cursed(); } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp index ceb47ee130..2f31686ff6 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp @@ -25,6 +25,8 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" +namespace Maraudon::Landslide +{ enum Spells { SPELL_KNOCKAWAY = 18670, @@ -106,8 +108,11 @@ public: } }; }; +} void AddSC_boss_landslide() { + using namespace Maraudon; + using namespace Maraudon::Landslide; new boss_landslide(); } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp index 870e6d4a15..4f9ace086d 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp @@ -25,6 +25,8 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" +namespace Maraudon::Noxxion +{ enum Spells { SPELL_TOXICVOLLEY = 21687, @@ -141,8 +143,11 @@ public: } }; }; +} void AddSC_boss_noxxion() { + using namespace Maraudon; + using namespace Maraudon::Noxxion; new boss_noxxion(); } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index 45a58c9d89..d98385c791 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -26,6 +26,8 @@ EndScriptData */ #include "ScriptedCreature.h" #include "ScriptedCreature.h" +namespace Maraudon::PrincessTheradas +{ enum Spells { SPELL_DUSTFIELD = 21909, @@ -118,8 +120,11 @@ public: } }; }; +} void AddSC_boss_ptheradras() { + using namespace Maraudon; + using namespace Maraudon::PrincessTheradas; new boss_princess_theradras(); } diff --git a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp index ef51191e11..5d1d5e3cee 100644 --- a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp @@ -25,6 +25,8 @@ gets instead the deserter debuff. #include "ScriptMgr.h" #include "InstanceScript.h" +namespace Maraudon +{ class instance_maraudon : public InstanceMapScript { public: @@ -40,8 +42,10 @@ public: instance_maraudon_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { } }; }; +} void AddSC_instance_maraudon() { + using namespace Maraudon; new instance_maraudon(); } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 0f6b5ab527..44e0331d5a 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -35,6 +35,8 @@ EndScriptData */ #include "ScriptedCreature.h" #include "TemporarySummon.h" +namespace OnyxiasLair::Onyxia +{ enum Yells { // Say @@ -495,8 +497,11 @@ public: return GetOnyxiaAI(creature); } }; +} void AddSC_boss_onyxia() { + using namespace OnyxiasLair; + using namespace OnyxiasLair::Onyxia; new boss_onyxia(); } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index d9b86fc8ac..7f72f2c3ad 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -30,6 +30,8 @@ EndScriptData */ #include "onyxias_lair.h" #include "TemporarySummon.h" +namespace OnyxiasLair +{ BossBoundaryData const boundaries = { { DATA_ONYXIA, new CircleBoundary(Position(-34.3697f, -212.3296f), 100.0) } @@ -264,8 +266,10 @@ public: bool achievSheDeepBreathMore; }; }; +} void AddSC_instance_onyxias_lair() { + using namespace OnyxiasLair; new instance_onyxias_lair(); } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h index 69fff591ad..4180720e6f 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h +++ b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace OnyxiasLair +{ #define OnyxiaScriptName "instance_onyxias_lair" #define DataHeader "OL" @@ -78,5 +80,6 @@ inline AI* GetOnyxiaAI(T* obj) { return GetInstanceAI(obj, OnyxiaScriptName); } +} #endif diff --git a/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp b/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp index c82b4c25f1..95909efdf2 100644 --- a/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp +++ b/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp @@ -26,6 +26,8 @@ gets instead the deserter debuff. #include "ScriptMgr.h" #include "InstanceScript.h" +namespace RagefireChasm +{ class instance_ragefire_chasm : public InstanceMapScript { public: @@ -45,8 +47,10 @@ public: return new instance_ragefire_chasm_InstanceMapScript(map); } }; +} void AddSC_instance_ragefire_chasm() { + using namespace RagefireChasm; new instance_ragefire_chasm(); } diff --git a/src/server/scripts/Kalimdor/RagefireChasm/ragefire_chasm.h b/src/server/scripts/Kalimdor/RagefireChasm/ragefire_chasm.h index 84f35ec863..2989c198a8 100644 --- a/src/server/scripts/Kalimdor/RagefireChasm/ragefire_chasm.h +++ b/src/server/scripts/Kalimdor/RagefireChasm/ragefire_chasm.h @@ -20,6 +20,8 @@ #include "Define.h" +namespace RagefireChasm +{ #define RCScriptName "instance_ragefire_chasm" #define DataHeader "RC" @@ -33,6 +35,7 @@ enum RCDataTypes DATA_BAZZALAN = 2, DATA_TARAGAMAN_THE_HUNGERER = 3 }; +} #endif // RAGEFIRE_CHASM_H_ diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp index d8bd862077..373c1e8a51 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -19,6 +19,8 @@ #include "ScriptedCreature.h" #include "razorfen_downs.h" +namespace RazorfenDowns::AmnennarTheColdbringer +{ enum Say { SAY_AGGRO = 0, @@ -154,8 +156,11 @@ public: return new boss_amnennar_the_coldbringerAI(creature); } }; +} void AddSC_boss_amnennar_the_coldbringer() { + using namespace RazorfenDowns; + using namespace RazorfenDowns::AmnennarTheColdbringer; new boss_amnennar_the_coldbringer(); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp index 392c605148..d93c2ac779 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp @@ -19,6 +19,8 @@ #include "ScriptedCreature.h" #include "razorfen_downs.h" +namespace RazorfenDowns::Glutton +{ enum Say { SAY_AGGRO = 0, @@ -100,8 +102,11 @@ public: return new boss_gluttonAI(creature); } }; +} void AddSC_boss_glutton() { + using namespace RazorfenDowns; + using namespace RazorfenDowns::Glutton; new boss_glutton(); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp index 5b7b52b2ce..59a773fd4c 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp @@ -19,6 +19,8 @@ #include "ScriptedCreature.h" #include "razorfen_downs.h" +namespace RazorfenDowns::MordreshFireEye +{ enum Say { SAY_OOC_1 = 0, @@ -132,8 +134,11 @@ public: return new boss_mordresh_fire_eyeAI(creature); } }; +} void AddSC_boss_mordresh_fire_eye() { + using namespace RazorfenDowns; + using namespace RazorfenDowns::MordreshFireEye; new boss_mordresh_fire_eye(); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp index 798300ecde..601e189f35 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp @@ -19,6 +19,8 @@ #include "ScriptedCreature.h" #include "razorfen_downs.h" +namespace RazorfenDowns::TutenKash +{ enum Spells { SPELL_THRASH = 8876, @@ -103,8 +105,11 @@ public: return new boss_tuten_kashAI(creature); } }; +} void AddSC_boss_tuten_kash() { + using namespace RazorfenDowns; + using namespace RazorfenDowns::TutenKash; new boss_tuten_kash(); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index 0eb7d1e9cb..02032e0f05 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -23,6 +23,8 @@ #include "razorfen_downs.h" #include "TemporarySummon.h" +namespace RazorfenDowns +{ Position const PosSummonTutenkash[15] = { // 7349 Tomb Fiend @@ -182,8 +184,10 @@ public: return new instance_razorfen_downs_InstanceMapScript(map); } }; +} void AddSC_instance_razorfen_downs() { + using namespace RazorfenDowns; new instance_razorfen_downs(); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 7c51227bc2..34fcde3917 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -39,6 +39,8 @@ EndContentData */ #include "ScriptedGossip.h" #include "TemporarySummon.h" +namespace RazorfenDowns +{ /*### ## npc_belnistrasz for Quest 3525 "Extinguishing the Idol" ######*/ @@ -395,9 +397,11 @@ class go_gong : public GameObjectScript return GetRazorfenDownsAI(go); } }; +} void AddSC_razorfen_downs() { + using namespace RazorfenDowns; new npc_belnistrasz(); new npc_idol_room_spawner(); new npc_tomb_creature(); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h index 1552b27340..032b3c527b 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace RazorfenDowns +{ #define RFDScriptName "instance_razorfen_downs" #define DataHeader "RFD" @@ -68,5 +70,6 @@ inline AI* GetRazorfenDownsAI(T* obj) { return GetInstanceAI(obj, RFDScriptName); } +} #endif diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index 3fac13d193..f878992f1e 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -30,6 +30,8 @@ EndScriptData */ #include "Player.h" #include "razorfen_kraul.h" +namespace RazorfenKraul +{ #define WARD_KEEPERS_NR 2 class instance_razorfen_kraul : public InstanceMapScript @@ -93,8 +95,10 @@ public: return new instance_razorfen_kraul_InstanceMapScript(map); } }; +} void AddSC_instance_razorfen_kraul() { + using namespace RazorfenKraul; new instance_razorfen_kraul(); } diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index 8371775d75..0f0db905bf 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -23,6 +23,8 @@ #include "PetAI.h" #include "SpellScript.h" +namespace RazorfenKraul +{ enum Willix { SAY_READY = 0, @@ -134,8 +136,10 @@ public: return new npc_willixAI(creature); } }; +} void AddSC_razorfen_kraul() { + using namespace RazorfenKraul; new npc_willix(); } diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h index c517b43806..71e4934820 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h @@ -18,7 +18,11 @@ #ifndef DEF_RAZORFEN_KRAUL_H #define DEF_RAZORFEN_KRAUL_H +namespace RazorfenKraul +{ #define DataHeader "RFK" #define EVENT_WARD_KEEPER 1 +} + #endif diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index 3ca47c2780..f7fcf48569 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -23,6 +23,8 @@ #include "ruins_of_ahnqiraj.h" #include "ScriptedCreature.h" +namespace RuinsOfAhnQiraj::Ayamiss +{ enum Spells { SPELL_STINGER_SPRAY = 25749, @@ -300,9 +302,12 @@ class npc_hive_zara_larva : public CreatureScript return GetAQ20AI(creature); } }; +} void AddSC_boss_ayamiss() { + using namespace RuinsOfAhnQiraj; + using namespace RuinsOfAhnQiraj::Ayamiss; new boss_ayamiss(); new npc_hive_zara_larva(); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index 54cbc34fc4..7b91baa65e 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -22,6 +22,8 @@ #include "ScriptedCreature.h" #include "SpellScript.h" +namespace RuinsOfAhnQiraj::Buru +{ enum Emotes { EMOTE_TARGET = 0 @@ -273,9 +275,12 @@ class spell_egg_explosion : public SpellScriptLoader return new spell_egg_explosion_SpellScript(); } }; +} void AddSC_boss_buru() { + using namespace RuinsOfAhnQiraj; + using namespace RuinsOfAhnQiraj::Buru; new boss_buru(); new npc_buru_egg(); new spell_egg_explosion(); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index f9a925a67f..ce5763b12e 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -22,6 +22,8 @@ #include "ruins_of_ahnqiraj.h" #include "ScriptedCreature.h" +namespace RuinsOfAhnQiraj::Kurinnaxx +{ enum Spells { SPELL_MORTALWOUND = 25646, @@ -140,8 +142,11 @@ class boss_kurinnaxx : public CreatureScript return GetAQ20AI(creature); } }; +} void AddSC_boss_kurinnaxx() { + using namespace RuinsOfAhnQiraj; + using namespace RuinsOfAhnQiraj::Kurinnaxx; new boss_kurinnaxx(); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 4d33a57c9b..e38507d3aa 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -19,6 +19,8 @@ #include "ScriptedCreature.h" #include "ruins_of_ahnqiraj.h" +namespace RuinsOfAhnQiraj::Moam +{ enum Texts { EMOTE_AGGRO = 0, @@ -185,8 +187,11 @@ class boss_moam : public CreatureScript return new boss_moamAI(creature); } }; +} void AddSC_boss_moam() { + using namespace RuinsOfAhnQiraj; + using namespace RuinsOfAhnQiraj::Moam; new boss_moam(); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index 292b068f23..dcc135cdbf 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -30,6 +30,8 @@ #include "Weather.h" #include "WorldPacket.h" +namespace RuinsOfAhnQiraj::Ossirian +{ enum Texts { SAY_SUPREME = 0, @@ -309,9 +311,12 @@ class go_ossirian_crystal : public GameObjectScript return GetAQ20AI(go); } }; +} void AddSC_boss_ossirian() { + using namespace RuinsOfAhnQiraj; + using namespace RuinsOfAhnQiraj::Ossirian; new boss_ossirian(); new go_ossirian_crystal(); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index a7cf348f69..b8b6e22cfa 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -20,6 +20,8 @@ #include "ScriptedCreature.h" #include "ruins_of_ahnqiraj.h" +namespace RuinsOfAhnQiraj::Rajaxx +{ enum Yells { // The time of our retribution is at hand! Let darkness reign in the hearts of our enemies! Sound: 8645 Emote: 35 @@ -122,8 +124,11 @@ class boss_rajaxx : public CreatureScript return new boss_rajaxxAI(creature); } }; +} void AddSC_boss_rajaxx() { + using namespace RuinsOfAhnQiraj; + using namespace RuinsOfAhnQiraj::Rajaxx; new boss_rajaxx(); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp index 8e93bab337..7003bea5fc 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp @@ -20,6 +20,8 @@ #include "InstanceScript.h" #include "ruins_of_ahnqiraj.h" +namespace RuinsOfAhnQiraj +{ class instance_ruins_of_ahnqiraj : public InstanceMapScript { public: @@ -110,8 +112,10 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript return new instance_ruins_of_ahnqiraj_InstanceMapScript(map); } }; +} void AddSC_instance_ruins_of_ahnqiraj() { + using namespace RuinsOfAhnQiraj; new instance_ruins_of_ahnqiraj(); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h index 0d68d29003..55c159c0f3 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace RuinsOfAhnQiraj +{ #define AQ20ScriptName "instance_ruins_of_ahnqiraj" #define DataHeader "AQR" @@ -65,5 +67,6 @@ inline AI* GetAQ20AI(T* obj) { return GetInstanceAI(obj, AQ20ScriptName); } +} #endif diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index cc532c476f..a191271bd8 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -29,6 +29,8 @@ EndScriptData */ #include "temple_of_ahnqiraj.h" #include "TemporarySummon.h" +namespace TempleOfAhnqiraj::BugTrio +{ enum Spells { SPELL_CLEAVE = 26350, @@ -328,9 +330,12 @@ public: return GetAQ40AI(creature); } }; +} void AddSC_bug_trio() { + using namespace TempleOfAhnqiraj; + using namespace TempleOfAhnqiraj::BugTrio; new boss_kri(); new boss_vem(); new boss_yauj(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index a1bc7a354c..8ed77b5caa 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -31,6 +31,8 @@ EndScriptData */ #include "temple_of_ahnqiraj.h" #include "TemporarySummon.h" +namespace TempleOfAhnqiraj::Cthun +{ /* * This is a 2 phases events. Here follows an explanation of the main events and transition between phases and sub-phases. * @@ -1281,11 +1283,14 @@ public: return GetAQ40AI(creature); } }; +} //GetAIs void AddSC_boss_cthun() { + using namespace TempleOfAhnqiraj; + using namespace TempleOfAhnqiraj::Cthun; new boss_eye_of_cthun(); new boss_cthun(); new npc_eye_tentacle(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index cc7093e066..cc58cfd52d 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -27,6 +27,8 @@ EndScriptData */ #include "temple_of_ahnqiraj.h" #include "TemporarySummon.h" +namespace TempleOfAhnqiraj::Fankriss +{ #define SOUND_SENTENCE_YOU 8588 #define SOUND_SERVE_TO 8589 #define SOUND_LAWS 8590 @@ -208,8 +210,11 @@ public: return GetAQ40AI(creature); } }; +} void AddSC_boss_fankriss() { + using namespace TempleOfAhnqiraj; + using namespace TempleOfAhnqiraj::Fankriss; new boss_fankriss(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 9839b0df30..72fce5336a 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -26,6 +26,8 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" +namespace TempleOfAhnqiraj::Huhuran +{ enum Huhuran { EMOTE_FRENZY_KILL = 0, @@ -154,8 +156,11 @@ public: }; }; +} void AddSC_boss_huhuran() { + using namespace TempleOfAhnqiraj; + using namespace TempleOfAhnqiraj::Huhuran; new boss_huhuran(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 10cb737b38..579994b2ff 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -20,6 +20,8 @@ #include "ScriptedCreature.h" #include "GameObject.h" +namespace TempleOfAhnqiraj::Ouro +{ enum Spells { // Ouro @@ -96,9 +98,12 @@ struct npc_ouro_spawner : public ScriptedAI void AttackStart(Unit* /*victim*/) override { } void UpdateAI(uint32 /*diff*/) override { } }; +} void AddSC_boss_ouro() { + using namespace TempleOfAhnqiraj; + using namespace TempleOfAhnqiraj::Ouro; RegisterTempleOfAhnqirajhCreatureAI(boss_ouro); RegisterTempleOfAhnqirajhCreatureAI(npc_ouro_spawner); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 9f40f37bf8..31ca4326a9 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -26,6 +26,8 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" +namespace TempleOfAhnqiraj::Sartura +{ enum Sartura { SAY_AGGRO = 0, @@ -312,9 +314,12 @@ public: }; }; +} void AddSC_boss_sartura() { + using namespace TempleOfAhnqiraj; + using namespace TempleOfAhnqiraj::Sartura; new boss_sartura(); new npc_sartura_royal_guard(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 13318bf8f7..062b4a6075 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -20,6 +20,8 @@ #include "SpellScript.h" #include "temple_of_ahnqiraj.h" +namespace TempleOfAhnqiraj::Skeram +{ enum Yells { SAY_AGGRO = 0, @@ -276,9 +278,12 @@ public: return new spell_skeram_true_fulfillment_SpellScript(); } }; +} void AddSC_boss_skeram() { + using namespace TempleOfAhnqiraj; + using namespace TempleOfAhnqiraj::Skeram; new boss_skeram(); new spell_skeram_arcane_explosion(); new spell_skeram_true_fulfillment(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index ee5bceb707..e79880533d 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -30,6 +30,8 @@ EndScriptData */ #include "SpellInfo.h" #include "temple_of_ahnqiraj.h" +namespace TempleOfAhnqiraj::TwinEmperors +{ enum Spells { SPELL_HEAL_BROTHER = 7393, @@ -594,9 +596,12 @@ public: return GetAQ40AI(creature); } }; +} void AddSC_boss_twinemperors() { + using namespace TempleOfAhnqiraj; + using namespace TempleOfAhnqiraj::TwinEmperors; new boss_veknilash(); new boss_veklor(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index e19d1e30f5..af5fb55eec 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -24,6 +24,8 @@ #include "temple_of_ahnqiraj.h" #include "TemporarySummon.h" +namespace TempleOfAhnqiraj::Viscidus +{ enum Spells { SPELL_POISON_SHOCK = 25993, @@ -312,9 +314,12 @@ class npc_glob_of_viscidus : public CreatureScript return GetAQ40AI(creature); } }; +} void AddSC_boss_viscidus() { + using namespace TempleOfAhnqiraj; + using namespace TempleOfAhnqiraj::Viscidus; new boss_viscidus(); new npc_glob_of_viscidus(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index b417dc3443..17473ce3d3 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -22,6 +22,8 @@ #include +namespace TempleOfAhnqiraj +{ ObjectData const creatureData[] = { { BOSS_VEM, DATA_VEM }, @@ -126,8 +128,10 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript return new instance_temple_of_ahnqiraj_InstanceMapScript(map); } }; +} void AddSC_instance_temple_of_ahnqiraj() { + using namespace TempleOfAhnqiraj; new instance_temple_of_ahnqiraj(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 04e1b1fa8c..fbb94e8184 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -27,6 +27,8 @@ EndScriptData */ #include "ScriptedCreature.h" #include "temple_of_ahnqiraj.h" +namespace TempleOfAhnqiraj::AnubisathSentinel +{ enum Spells { SPELL_MENDING_BUFF = 2147, @@ -258,8 +260,11 @@ public: return GetAQ40AI(creature); } }; +} void AddSC_npc_anubisath_sentinel() { + using namespace TempleOfAhnqiraj; + using namespace TempleOfAhnqiraj::AnubisathSentinel; new npc_anubisath_sentinel(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h index ceeb5f7bab..611e09eea2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace TempleOfAhnqiraj +{ #define AQ40ScriptName "instance_temple_of_ahnqiraj" #define DataHeader "AQT" @@ -98,5 +100,6 @@ inline AI* GetAQ40AI(T* obj) } #define RegisterTempleOfAhnqirajhCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetAQ40AI) +} #endif diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp index ace57169b7..1fd0278c90 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp @@ -30,6 +30,8 @@ #include "TemporarySummon.h" #include "Map.h" +namespace ThroneOfTheFourWinds::Alakir +{ enum Spells { // Al'Akir @@ -1181,9 +1183,12 @@ class spell_alakir_lightning_script: public SpellScript OnEffectHitTarget.Register(&spell_alakir_lightning_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; +} void AddSC_boss_alakir() { + using namespace ThroneOfTheFourWinds; + using namespace ThroneOfTheFourWinds::Alakir; RegisterThroneOfTheFourWindsCreatureAI(boss_alakir); RegisterThroneOfTheFourWindsCreatureAI(npc_alakir_ice_storm); RegisterThroneOfTheFourWindsCreatureAI(npc_alakir_stormling); diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp index 2ab0ff966d..146404a8c9 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp @@ -30,6 +30,8 @@ #include "ObjectAccessor.h" #include "MotionMaster.h" +namespace ThroneOfTheFourWinds::ConclaveOfWind +{ enum Spells { // Conclave of Wind @@ -1293,9 +1295,12 @@ class spell_conclave_of_wind_sleet_storm : public SpellScript private: uint32 _targetCount; }; +} void AddSC_boss_conclave_of_wind() { + using namespace ThroneOfTheFourWinds; + using namespace ThroneOfTheFourWinds::ConclaveOfWind; RegisterThroneOfTheFourWindsCreatureAI(boss_anshal); RegisterThroneOfTheFourWindsCreatureAI(boss_nezir); RegisterThroneOfTheFourWindsCreatureAI(boss_rohash); diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp index 5aecac2e5f..1bdd57f56c 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp @@ -30,6 +30,8 @@ #include "Player.h" #include "Creature.h" +namespace ThroneOfTheFourWinds +{ ObjectData const creatureData[] = { { BOSS_ANSHAL, DATA_ANSHAL }, @@ -354,8 +356,10 @@ class instance_throne_of_the_four_winds : public InstanceMapScript return new instance_throne_of_the_four_winds_InstanceMapScript(map); } }; +} void AddSC_instance_throne_of_the_four_winds() { + using namespace ThroneOfTheFourWinds; new instance_throne_of_the_four_winds(); } diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp index ff06fe2780..84db9d0d64 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp @@ -29,6 +29,8 @@ #include "MotionMaster.h" #include "throne_of_the_four_winds.h" +namespace ThroneOfTheFourWinds +{ enum Spells { SPELL_JET_STREAM = 84576, @@ -274,9 +276,11 @@ struct npc_totfw_slipstream : public ScriptedAI DoCast(passenger, SPELL_SLIPSTREAM_SAFE_FALL); } }; +} void AddSC_throne_of_the_four_winds() { + using namespace ThroneOfTheFourWinds; new at_totfw_jet_stream(); new at_totfw_catch_fall(); new npc_totfw_fall_catcher(); diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.h b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.h index df4930dde1..5797adf283 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.h +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace ThroneOfTheFourWinds +{ #define TotFWScriptName "instance_throne_of_the_four_winds" #define DataHeader "TOTFW" @@ -133,5 +135,6 @@ inline AI* GetThroneOfTheFourWindsAI(T* obj) } #define RegisterThroneOfTheFourWindsCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetThroneOfTheFourWindsAI) +} #endif // THRONE_OF_THE_FOUR_WINDS_H_ diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp index 75d655dc77..5a295e00ec 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp @@ -28,6 +28,8 @@ #include "ObjectAccessor.h" #include "vortex_pinnacle.h" +namespace VortexPinnacle::Altairus +{ enum Spells { // Altairus @@ -374,9 +376,12 @@ class spell_altairus_safe_area : public AuraScript AfterEffectRemove.Register(&spell_altairus_safe_area::HandleLightningBlast, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; +} void AddSC_boss_altairus() { + using namespace VortexPinnacle; + using namespace VortexPinnacle::Altairus; RegisterVortexPinnacleCreatureAI(boss_altairus); RegisterSpellScript(spell_altairus_call_the_wind); RegisterSpellAndAuraScriptPair(spell_altairus_upwind_of_altairus, spell_altairus_upwind_of_altairus_AuraScript); diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp index 933bae69a7..a798eaa1c9 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp @@ -29,6 +29,8 @@ #include "TemporarySummon.h" #include "vortex_pinnacle.h" +namespace VortexPinnacle::Asaad +{ enum Spells { // Asaad @@ -735,9 +737,12 @@ class spell_asaad_supremacy_of_the_storm_damage: public SpellScript OnObjectAreaTargetSelect.Register(&spell_asaad_supremacy_of_the_storm_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; +} void AddSC_boss_asaad() { + using namespace VortexPinnacle; + using namespace VortexPinnacle::Asaad; RegisterVortexPinnacleCreatureAI(boss_asaad); RegisterVortexPinnacleCreatureAI(npc_asaad_unstable_grounding_field); RegisterSpellScript(spell_asaad_sots_targeting); diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp index 55b45f91ae..21147b0de8 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp @@ -26,6 +26,8 @@ #include "SpellInfo.h" #include "vortex_pinnacle.h" +namespace VortexPinnacle::GrandVizierErtan +{ enum Spells { // Grandvizier Ertan @@ -274,9 +276,12 @@ class spell_ertan_storms_edge_script : public SpellScript OnEffectHitTarget.Register(&spell_ertan_storms_edge_script::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; +} void AddSC_boss_grand_vizier_ertan() { + using namespace VortexPinnacle; + using namespace VortexPinnacle::GrandVizierErtan; RegisterVortexPinnacleCreatureAI(boss_grand_vizier_ertan); RegisterVortexPinnacleCreatureAI(npc_ertan_ertans_vortex); RegisterSpellScript(spell_ertan_storms_edge); diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/instance_vortex_pinnacle.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/instance_vortex_pinnacle.cpp index e5af600fa0..e9e20b475c 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/instance_vortex_pinnacle.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/instance_vortex_pinnacle.cpp @@ -25,6 +25,8 @@ #include "TemporarySummon.h" #include "vortex_pinnacle.h" +namespace VortexPinnacle +{ #define MAX_ENCOUNTER 3 /* The Vortex Pinnacle encounters: @@ -266,8 +268,10 @@ class instance_vortex_pinnacle : public InstanceMapScript return new instance_vortex_pinnacle_InstanceScript(map); } }; +} void AddSC_instance_vortex_pinnacle() { + using namespace VortexPinnacle; new instance_vortex_pinnacle(); } diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp index fa0c97f2b2..4ced771c27 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp @@ -30,6 +30,8 @@ #include "Vehicle.h" #include "vortex_pinnacle.h" +namespace VortexPinnacle +{ enum Texts { SAY_FEIGN_DEATH = 0 @@ -872,9 +874,11 @@ public: return true; } }; +} void AddSC_vortex_pinnacle() { + using namespace VortexPinnacle; RegisterVortexPinnacleCreatureAI(npc_lurking_tempest); RegisterVortexPinnacleCreatureAI(npc_vp_howling_gale); RegisterVortexPinnacleCreatureAI(npc_slipstream); diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h index 6a39e812dc..e4d6bddb1a 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h +++ b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace VortexPinnacle +{ #define VPScriptName "instance_vortex_pinnacle" #define DataHeader "VP" @@ -116,5 +118,6 @@ inline AI* GetVortexPinnacleAI(T* obj) } #define RegisterVortexPinnacleCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetVortexPinnacleAI) +} #endif // DEF_VORTEX_PINNACLE_H diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_kresh.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_kresh.cpp index a109cc6294..13d6804312 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/boss_kresh.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_kresh.cpp @@ -19,6 +19,8 @@ #include "ScriptMgr.h" #include "wailing_caverns.h" +namespace WailingCaverns::Kresh +{ enum Spells { SPELL_CRUSHING_BITE = 80362 @@ -77,9 +79,11 @@ public: return GetWailingCavernsAI(creature); } }; - +} void AddSC_boss_kresh() { + using namespace WailingCaverns; + using namespace WailingCaverns::Kresh; new boss_kresh(); } diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_lady_anacondra.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_lady_anacondra.cpp index 067d35a9f0..73febc0671 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/boss_lady_anacondra.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_lady_anacondra.cpp @@ -19,6 +19,8 @@ #include "ScriptMgr.h" #include "wailing_caverns.h" +namespace WailingCaverns::LadyAnacondra +{ enum Texts { SAY_AGGRO = 0 @@ -124,9 +126,10 @@ public: return GetWailingCavernsAI(creature); } }; - +} void AddSC_boss_lady_anacondra() { + using namespace WailingCaverns::LadyAnacondra; new boss_lady_anacondra(); } diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_cobrahn.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_cobrahn.cpp index e5e4a07408..5193656347 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_cobrahn.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_cobrahn.cpp @@ -19,6 +19,8 @@ #include "ScriptMgr.h" #include "wailing_caverns.h" +namespace WailingCaverns::LordCobrahn +{ enum Texts { SAY_AGGRO = 0 @@ -112,9 +114,11 @@ public: return GetWailingCavernsAI(creature); } }; - +} void AddSC_boss_lord_cobrahn() { + using namespace WailingCaverns; + using namespace WailingCaverns::LordCobrahn; new boss_lord_cobrahn(); } diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_pythas.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_pythas.cpp index fde38dc4cd..9f0d73c111 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_pythas.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_pythas.cpp @@ -19,6 +19,8 @@ #include "ScriptMgr.h" #include "wailing_caverns.h" +namespace WailingCaverns::LordPythas +{ enum Texts { SAY_AGGRO = 0 @@ -108,9 +110,11 @@ public: return GetWailingCavernsAI(creature); } }; - +} void AddSC_boss_lord_pythas() { + using namespace WailingCaverns; + using namespace WailingCaverns::LordPythas; new boss_lord_pythas(); } diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_serpentis.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_serpentis.cpp index 60704b9b55..bfa9d03598 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_serpentis.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_serpentis.cpp @@ -19,6 +19,8 @@ #include "ScriptMgr.h" #include "wailing_caverns.h" +namespace WailingCaverns::LordSerpentis +{ enum Texts { SAY_AGGRO = 0 @@ -101,9 +103,11 @@ public: return GetWailingCavernsAI(creature); } }; - +} void AddSC_boss_lord_serpentis() { + using namespace WailingCaverns; + using namespace WailingCaverns::LordSerpentis; new boss_lord_serpentis(); } diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_skum.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_skum.cpp index 771dfebeb0..b68e0ebc82 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/boss_skum.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_skum.cpp @@ -19,6 +19,8 @@ #include "ScriptMgr.h" #include "wailing_caverns.h" +namespace WailingCaverns::Skum +{ enum Spells { SPELL_CHAINED_BOLT = 6254 @@ -80,9 +82,10 @@ public: return GetWailingCavernsAI(creature); } }; - +} void AddSC_boss_skum() { + using namespace WailingCaverns::Skum; new boss_skum(); } diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_verdan_the_everliving.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_verdan_the_everliving.cpp index 54432216be..24667778b2 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/boss_verdan_the_everliving.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_verdan_the_everliving.cpp @@ -19,6 +19,8 @@ #include "ScriptMgr.h" #include "wailing_caverns.h" +namespace WailingCaverns::VerdanTheEverliving +{ enum Spells { SPELL_GRASPING_VINES = 8142 @@ -80,9 +82,11 @@ public: return GetWailingCavernsAI(creature); } }; - +} void AddSC_boss_verdan_the_everliving() { + using namespace WailingCaverns; + using namespace WailingCaverns::VerdanTheEverliving; new boss_verdan_the_everliving(); } diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index fab5d1bd8d..a8b96a1587 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -28,6 +28,8 @@ EndScriptData */ #include "Map.h" #include "wailing_caverns.h" +namespace WailingCaverns +{ ObjectData const creatureData[] = { { NPC_LADY_ANACONDRA, DATA_LADY_ANACONDRA }, @@ -106,8 +108,10 @@ public: } }; +} void AddSC_instance_wailing_caverns() { + using namespace WailingCaverns; new instance_wailing_caverns(); } diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index 0648bbc7cb..1d5e0d6246 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -38,6 +38,8 @@ EndContentData */ ## npc_disciple_of_naralex ######*/ +namespace WailingCaverns +{ enum Enums { SAY_AT_LAST = 0, @@ -361,8 +363,10 @@ public: return GetWailingCavernsAI(creature); } }; +} void AddSC_wailing_caverns() { + using namespace WailingCaverns; new npc_disciple_of_naralex(); } diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h index bbcd78725b..f1bda23e8c 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace WailingCaverns +{ #define DataHeader "WC" #define WCScriptName "instance_wailing_caverns" @@ -69,5 +71,6 @@ inline AI* GetWailingCavernsAI(T* obj) { return GetInstanceAI(obj, WCScriptName); } +} #endif // WAILING_CAVERNS_H diff --git a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp index b80a57b201..993f228ce2 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp @@ -25,6 +25,8 @@ Category: Tanaris, ZulFarrak #include "ScriptedCreature.h" #include "zulfarrak.h" +namespace Zulfarrak::ZumRah +{ enum Says { SAY_SANCT_INVADE = 0, @@ -156,8 +158,10 @@ public: return GetZulFarrakAI(creature); } }; +} void AddSC_boss_zum_rah() { + using namespace Zulfarrak::ZumRah; new boss_zum_rah(); } diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 8b5b050e79..195265645d 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -23,6 +23,8 @@ #include "TemporarySummon.h" #include "zulfarrak.h" +namespace Zulfarrak +{ enum Misc { // Creatures @@ -373,8 +375,10 @@ public: return new instance_zulfarrak_InstanceMapScript(map); } }; +} void AddSC_instance_zulfarrak() { + using namespace Zulfarrak; new instance_zulfarrak(); } diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 4e8f7a87cd..aee003ae2a 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -38,6 +38,8 @@ EndContentData */ #include "ScriptedGossip.h" #include "zulfarrak.h" +namespace Zulfarrak +{ /*###### ## npc_sergeant_bly ######*/ @@ -463,9 +465,11 @@ public: } }; +} void AddSC_zulfarrak() { + using namespace Zulfarrak; new npc_sergeant_bly(); new npc_weegli_blastfuse(); new go_shallow_grave(); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h index a4eaca7664..10432b3cc2 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace Zulfarrak +{ #define ZFScriptName "instance_zulfarrak" #define DataHeader "ZF" @@ -61,5 +63,6 @@ inline AI* GetZulFarrakAI(T* obj) { return GetInstanceAI(obj, ZFScriptName); } +} #endif diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index 1d6ef0c45f..60312b3206 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -34,6 +34,8 @@ EndContentData */ #include "SpellInfo.h" #include "SpellScript.h" +namespace Ashenvale +{ /*#### # npc_ruul_snowhoof ####*/ @@ -384,9 +386,11 @@ class spell_destroy_karangs_banner : public SpellScriptLoader return new spell_destroy_karangs_banner_SpellScript(); } }; +} void AddSC_ashenvale() { + using namespace Ashenvale; new npc_ruul_snowhoof(); new npc_muglash(); new go_naga_brazier(); diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 1636d64a23..3cbc5b910b 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -42,6 +42,8 @@ EndContentData */ #include "ScriptedGossip.h" #include "TemporarySummon.h" +namespace AzuremstIsle +{ /*###### ## npc_draenei_survivor ######*/ @@ -717,9 +719,11 @@ public: return new npc_death_ravagerAI(creature); } }; +} void AddSC_azuremyst_isle() { + using namespace AzuremstIsle; new npc_draenei_survivor(); new npc_engineer_spark_overgrind(); new npc_injured_draenei(); diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 0abcd09082..aa06a0d798 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -36,6 +36,8 @@ EndContentData */ #include "Player.h" #include "ScriptedEscortAI.h" +namespace BloodmystIsle +{ /*###### ## npc_webbed_creature ######*/ @@ -823,9 +825,11 @@ public: return new npc_demolitionist_legosoAI(creature); } }; +} void AddSC_bloodmyst_isle() { + using namespace BloodmystIsle; new npc_webbed_creature(); new npc_sironas(); new npc_demolitionist_legoso(); diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp index e2beb7fea9..b1946a6877 100644 --- a/src/server/scripts/Kalimdor/zone_desolace.cpp +++ b/src/server/scripts/Kalimdor/zone_desolace.cpp @@ -34,6 +34,8 @@ EndContentData */ #include "ScriptedGossip.h" #include "SpellInfo.h" +namespace Desolace +{ enum DyingKodo { SAY_SMEED_HOME = 0, @@ -127,8 +129,10 @@ public: return new npc_aged_dying_ancient_kodoAI(creature); } }; +} void AddSC_desolace() { + using namespace Desolace; new npc_aged_dying_ancient_kodo(); } diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp index ec2d65276e..70d76cbd59 100644 --- a/src/server/scripts/Kalimdor/zone_durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp @@ -22,6 +22,8 @@ #include "SpellInfo.h" #include "SpellScript.h" +namespace Durotar +{ enum VoodooSpells { SPELL_BREW = 16712, // Special Brew @@ -77,9 +79,11 @@ class spell_zuni_lvl_1_trigger_aura : public SpellScript OnEffectHitTarget.Register(&spell_zuni_lvl_1_trigger_aura::HandleDummy, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; +} void AddSC_durotar() { + using namespace Durotar; new spell_voodoo(); RegisterSpellScript(spell_zuni_lvl_1_trigger_aura); } diff --git a/src/server/scripts/Kalimdor/zone_felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp index ce5cadd9a5..6f2ee579ea 100644 --- a/src/server/scripts/Kalimdor/zone_felwood.cpp +++ b/src/server/scripts/Kalimdor/zone_felwood.cpp @@ -21,6 +21,8 @@ #include "ScriptedCreature.h" #include "SpellScript.h" +namespace Felwood +{ /*###### ## npc_whisperwind_lasher ######*/ @@ -251,9 +253,11 @@ class spell_ruumbos_silly_dance : public SpellScriptLoader return new spell_ruumbos_silly_dance_SpellScript(); } }; +} void AddSC_felwood() { + using namespace Felwood; new npc_whisperwind_lasher(); new spell_swipe_honey(); new spell_beesbees(); diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index d579e60afa..43448fe672 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -23,6 +23,8 @@ #include "SpellInfo.h" +namespace Moonglade +{ /*#### # npc_omen ####*/ @@ -168,9 +170,11 @@ public: return new npc_giant_spotlightAI(creature); } }; +} void AddSC_moonglade() { + using namespace Moonglade; new npc_omen(); new npc_giant_spotlight(); } diff --git a/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp b/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp index f431b5c60b..964500f908 100644 --- a/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp +++ b/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp @@ -31,6 +31,8 @@ #include "Player.h" #include "SpellScript.h" +namespace MountHyjal +{ enum CommonDefines { // Move Points @@ -728,9 +730,11 @@ class at_mh_hyjal_barrow_dens : public AreaTriggerScript return true; } }; +} void AddSC_mount_hyjal() { + using namespace MountHyjal; RegisterCreatureAI(npc_mh_aronus); RegisterCreatureAI(npc_mh_faerie_dragon); RegisterCreatureAI(npc_mh_twilight_inciter); diff --git a/src/server/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp index e578435779..11ccf9e637 100644 --- a/src/server/scripts/Kalimdor/zone_mulgore.cpp +++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp @@ -20,6 +20,8 @@ #include "ScriptedCreature.h" #include "SpellInfo.h" +namespace Mulgore +{ enum EagleSpirit { SPELL_EJECT_ALL_PASSENGERS = 50630, @@ -212,9 +214,11 @@ struct npc_mulgore_chief_squealer_thornmantle : public ScriptedAI private: EventMap _events; }; +} void AddSC_mulgore() { + using namespace Mulgore; RegisterCreatureAI(npc_mulgore_eagle_spirit); RegisterCreatureAI(npc_mulgore_captured_brave); RegisterCreatureAI(npc_mulgore_chief_squealer_thornmantle); diff --git a/src/server/scripts/Kalimdor/zone_northern_barrens.cpp b/src/server/scripts/Kalimdor/zone_northern_barrens.cpp index ba5eea503f..ad73c27d24 100644 --- a/src/server/scripts/Kalimdor/zone_northern_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_northern_barrens.cpp @@ -24,6 +24,8 @@ #include "SpellInfo.h" #include "TemporarySummon.h" +namespace NorthernBarrens +{ /*###### ## npc_beaten_corpse ######*/ @@ -645,8 +647,10 @@ public: } }; +} void AddSC_northern_barrens() { + using namespace NorthernBarrens; new npc_wizzlecrank_shredder(); } diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 177c99c810..5246f838c7 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -39,6 +39,8 @@ EndContentData */ #include "ScriptedGossip.h" #include "TemporarySummon.h" +namespace Silithus +{ /*##### # Quest: A Pawn on the Eternal Board #####*/ @@ -1376,9 +1378,11 @@ class go_wind_stone : public GameObjectScript return new go_wind_stoneAI(go); } }; +} void AddSC_silithus() { + using namespace Silithus; new go_crystalline_tear(); new npc_anachronos_quest_trigger(); new npc_anachronos_the_ancient(); diff --git a/src/server/scripts/Kalimdor/zone_southern_barrens.cpp b/src/server/scripts/Kalimdor/zone_southern_barrens.cpp index aa411aa618..60cbd76aa1 100644 --- a/src/server/scripts/Kalimdor/zone_southern_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_southern_barrens.cpp @@ -19,6 +19,8 @@ #include "DBCStores.h" #include "Player.h" +namespace SouthernBarrens +{ enum RazorfenKraulEntrance { AREA_ID_RAZORFEN_KRAUL = 1717, @@ -43,8 +45,10 @@ public: return true; } }; +} void AddSC_southern_barrens() { + using namespace SouthernBarrens; new at_sb_razorfen_kraul_entrance(); } diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index a0100d23aa..1534671cc2 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -36,6 +36,8 @@ EndContentData */ #include "ScriptedGossip.h" #include "WorldSession.h" +namespace Tanaris +{ /*###### ## npc_custodian_of_time ######*/ @@ -418,9 +420,11 @@ class npc_tooga : public CreatureScript } }; }; +} void AddSC_tanaris() { + using namespace Tanaris; new npc_custodian_of_time(); new npc_OOX17(); } diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp index 791a03af51..1a1a09b55d 100644 --- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp @@ -31,6 +31,8 @@ EndScriptData */ # npc_cairne_bloodhoof ######*/ +namespace ThunderBluff +{ enum CairneBloodhoof { SPELL_BERSERKER_CHARGE = 16636, @@ -130,8 +132,10 @@ public: }; }; +} void AddSC_thunder_bluff() { + using namespace ThunderBluff; new npc_cairne_bloodhoof(); } diff --git a/src/server/scripts/Kalimdor/zone_uldum.cpp b/src/server/scripts/Kalimdor/zone_uldum.cpp index c7c033dc23..84de9d3dbc 100644 --- a/src/server/scripts/Kalimdor/zone_uldum.cpp +++ b/src/server/scripts/Kalimdor/zone_uldum.cpp @@ -35,6 +35,8 @@ #include "Unit.h" #include "Vehicle.h" +namespace Uldum +{ enum UldumIntro { // Phase IDs @@ -550,9 +552,11 @@ class spell_uldum_rescue_survivor : public SpellScript OnEffectHitTarget.Register(&spell_uldum_rescue_survivor::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; +} void AddSC_uldum() { + using namespace Uldum; /* RegisterCreatureAI(npc_uldum_uldum_camera_bunny_04); RegisterCreatureAI(npc_uldum_uldum_skarf); diff --git a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp index d79b27381d..0612ee8e3d 100644 --- a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp @@ -15,6 +15,11 @@ * with this program. If not, see . */ -void AddSC_ungoro_crater() +namespace UnguroCrater { } + +void AddSC_ungoro_crater() +{ + using namespace UnguroCrater; +} diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index bf5e0626fc..c4786edc05 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -36,6 +36,8 @@ EndContentData */ #include "ScriptedEscortAI.h" #include "TemporarySummon.h" +namespace Winterspring +{ enum Says { // Escort texts @@ -593,9 +595,11 @@ class go_elune_fire : public GameObjectScript return new go_elune_fireAI(go); } }; +} void AddSC_winterspring() { + using namespace Winterspring; new npc_ranshalla(); new go_elune_fire(); }