From 2f79b0f266e48778f13f9e183b41bfd8baa6f8bd Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 21 Mar 2011 10:52:14 +0100 Subject: Core: Removed all double (and more) empty lines --- .../AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp | 1 - src/server/scripts/Northrend/CMakeLists.txt | 1 + .../TrialOfTheChampion/boss_grand_champions.cpp | 3 --- .../TrialOfTheChampion/instance_trial_of_the_champion.cpp | 2 -- .../TrialOfTheChampion/trial_of_the_champion.cpp | 1 - .../TrialOfTheChampion/trial_of_the_champion.h | 1 - .../TrialOfTheCrusader/boss_anubarak_trial.cpp | 4 ---- .../TrialOfTheCrusader/boss_faction_champions.cpp | 1 - .../TrialOfTheCrusader/boss_northrend_beasts.cpp | 6 ------ .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 6 ------ .../scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp | 1 - .../Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp | 1 - .../Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp | 1 - .../HallsOfReflection/instance_halls_of_reflection.cpp | 2 -- .../scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp | 2 -- src/server/scripts/Northrend/Gundrak/boss_eck.cpp | 2 -- src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp | 1 - src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp | 1 - src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp | 3 --- src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp | 2 -- src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp | 2 -- src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp | 2 -- src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp | 1 - src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp | 2 -- src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp | 2 -- src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp | 1 - src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp | 2 -- src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp | 2 -- src/server/scripts/Northrend/Naxxramas/boss_noth.cpp | 1 - src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp | 1 - src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp | 1 - src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp | 1 - src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp | 3 --- .../scripts/Northrend/Naxxramas/instance_naxxramas.cpp | 1 - .../scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp | 1 - src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp | 3 --- .../scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp | 1 - .../scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp | 1 - src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp | 3 --- .../scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp | 1 - .../scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp | 1 - src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp | 1 - .../scripts/Northrend/Nexus/Oculus/instance_oculus.cpp | 2 -- src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp | 1 - .../scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp | 13 ------------- .../Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp | 1 - .../Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp | 2 -- .../Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp | 3 --- .../Northrend/Ulduar/HallsOfLightning/boss_loken.cpp | 1 - .../Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp | 1 - .../Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp | 1 - .../Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp | 1 - .../scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp | 3 --- .../Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp | 4 ---- .../Ulduar/HallsOfStone/instance_halls_of_stone.cpp | 1 - .../Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp | 5 ----- src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp | 1 - src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp | 1 - .../scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp | 6 ------ src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp | 1 - src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp | 5 ----- .../scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp | 1 - .../UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp | 3 --- .../Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp | 3 --- .../UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp | 2 -- .../UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp | 1 - .../Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp | 1 - .../Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp | 4 ---- .../Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp | 2 -- src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp | 1 - src/server/scripts/Northrend/VioletHold/boss_erekem.cpp | 2 -- src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp | 3 --- src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp | 1 - src/server/scripts/Northrend/VioletHold/boss_moragg.cpp | 1 - src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp | 2 -- src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp | 1 - .../scripts/Northrend/VioletHold/instance_violet_hold.cpp | 1 - src/server/scripts/Northrend/VioletHold/violet_hold.cpp | 4 ---- src/server/scripts/Northrend/dragonblight.cpp | 1 - src/server/scripts/Northrend/zuldrak.cpp | 2 -- 80 files changed, 1 insertion(+), 164 deletions(-) (limited to 'src/server/scripts/Northrend') diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index 8576586ff58..99714484447 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -103,7 +103,6 @@ public: } } - uint64 GetData64(uint32 identifier) { switch(identifier) diff --git a/src/server/scripts/Northrend/CMakeLists.txt b/src/server/scripts/Northrend/CMakeLists.txt index 898fe59c054..61521fd8ba2 100644 --- a/src/server/scripts/Northrend/CMakeLists.txt +++ b/src/server/scripts/Northrend/CMakeLists.txt @@ -155,6 +155,7 @@ set(scripts_STAT_SRCS Northrend/IcecrownCitadel/boss_professor_putricide.cpp Northrend/IcecrownCitadel/boss_blood_prince_council.cpp Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp + Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp Northrend/IcecrownCitadel/boss_sindragosa.cpp Northrend/zuldrak.cpp Northrend/icecrown.cpp diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 6560fa39df4..1876c6fbaf9 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -529,7 +529,6 @@ public: uiFireBallTimer = 5000; } else uiFireBallTimer -= uiDiff; - if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) return; @@ -723,7 +722,6 @@ public: } }; - class boss_hunter_toc5 : public CreatureScript { public: @@ -879,7 +877,6 @@ public: } }; - class boss_rouge_toc5 : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 0d9ead03319..4d65b04555e 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -15,7 +15,6 @@ * with this program. If not, see . */ - /* ScriptData SDName: Instance Trial of the Champion SDComment: @@ -336,7 +335,6 @@ public: }; - void AddSC_instance_trial_of_the_champion() { new instance_trial_of_the_champion(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 03d38570db0..bf4d8f2ef4f 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -400,7 +400,6 @@ public: } } - void UpdateAI(const uint32 uiDiff) { ScriptedAI::UpdateAI(uiDiff); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h index bde74cf170d..d8ce6b9dca7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h @@ -19,7 +19,6 @@ #ifndef DEF_TOC_H #define DEF_TOC_H - enum eData { BOSS_GRAND_CHAMPIONS, diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index f91076d7f48..7002c1c2fb3 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -405,7 +405,6 @@ public: }; - class mob_swarm_scarab : public CreatureScript { public: @@ -473,7 +472,6 @@ public: }; - class mob_nerubian_burrower : public CreatureScript { public: @@ -551,7 +549,6 @@ public: }; - class mob_frost_sphere : public CreatureScript { public: @@ -632,7 +629,6 @@ public: }; - class mob_anubarak_spike : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index 615aee4de7d..62fa2f8a2ad 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -249,7 +249,6 @@ public: }; - struct boss_faction_championsAI : public ScriptedAI { boss_faction_championsAI(Creature* pCreature, uint32 aitype) : ScriptedAI(pCreature) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 44382ebc7c8..ba8682d9452 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -224,7 +224,6 @@ public: }; - class mob_snobold_vassal : public CreatureScript { public: @@ -358,7 +357,6 @@ public: }; - struct boss_jormungarAI : public ScriptedAI { boss_jormungarAI(Creature* creature) : ScriptedAI(creature) @@ -571,7 +569,6 @@ struct boss_jormungarAI : public ScriptedAI bool enraged; }; - class boss_acidmaw : public CreatureScript { public: @@ -604,7 +601,6 @@ class boss_acidmaw : public CreatureScript } }; - class boss_dreadscale : public CreatureScript { public: @@ -636,7 +632,6 @@ public: } }; - class mob_slime_pool : public CreatureScript { public: @@ -909,7 +904,6 @@ public: }; - void AddSC_boss_northrend_beasts() { new boss_gormok(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 113dfe97347..64628fe66a0 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -102,7 +102,6 @@ enum Actions ACTION_PACT }; - /*###### ## boss_twin_base ######*/ @@ -490,7 +489,6 @@ public: }; - /*###### ## boss_eydis ######*/ @@ -536,7 +534,6 @@ public: }; - class mob_essence_of_twin : public CreatureScript { public: @@ -562,7 +559,6 @@ public: } }; - struct mob_unleashed_ballAI : public ScriptedAI { mob_unleashed_ballAI(Creature *pCreature) : ScriptedAI(pCreature) @@ -645,7 +641,6 @@ public: }; - class mob_unleashed_light : public CreatureScript { public: @@ -679,7 +674,6 @@ public: }; - void AddSC_boss_twin_valkyr() { new boss_fjola(); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 745877eaaff..11ebbb6199b 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -250,7 +250,6 @@ public: } }; - void AddSC_boss_tharon_ja() { new boss_tharon_ja; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index c377b899dff..d0e1794be95 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -140,7 +140,6 @@ public: }; - void AddSC_boss_falric() { new boss_falric(); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 4049561eb00..c8c512e8d98 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -131,7 +131,6 @@ public: }; - void AddSC_boss_marwyn() { new boss_marwyn(); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 6441b72b224..373ad249f9b 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -218,7 +218,6 @@ public: return; } - if (uiWaveCount && data == NOT_STARTED) DoWipe(); @@ -423,7 +422,6 @@ public: }; - void AddSC_instance_halls_of_reflection() { new instance_halls_of_reflection(); diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 8c4934b0b04..403feb7cf3e 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -106,7 +106,6 @@ class boss_drakkari_colossus : public CreatureScript phase = COLOSSUS_PHASE_NORMAL; - // Note: This should not be called, but before use SetBossState function we should use BossAI // in all the bosses of the instance instance->SetData(DATA_DRAKKARI_COLOSSUS_EVENT, NOT_STARTED); @@ -438,7 +437,6 @@ public: } } - void AttackStart(Unit* attacker) { if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index df5c39f64aa..64a32fbfcec 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -133,7 +133,6 @@ public: }; - class npc_ruins_dweller : public CreatureScript { public: @@ -166,7 +165,6 @@ public: }; - void AddSC_boss_eck() { new boss_eck(); diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index b5b095071bb..d5f6bcf5a4b 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -283,7 +283,6 @@ public: }; - void AddSC_boss_gal_darah() { new boss_gal_darah(); diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index 54e9e41a1c1..e39151551a7 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -170,7 +170,6 @@ public: }; - void AddSC_boss_moorabi() { new boss_moorabi(); diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 666e27aed27..e6498c889ac 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -265,9 +265,6 @@ public: }; - - - void AddSC_boss_slad_ran() { new boss_slad_ran(); diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 74fb004b476..046f1dc1fb5 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -352,7 +352,6 @@ public: << (uiDrakkariColossusStatue ? GetObjState(uiDrakkariColossusStatue) : GO_STATE_ACTIVE) << " " << (uiGalDarahStatue ? GetObjState(uiGalDarahStatue) : GO_STATE_READY) << " " << (uiBridge ? GetObjState(uiBridge) : GO_STATE_ACTIVE) << " " << (uiCollision ? GetObjState(uiCollision) : GO_STATE_READY); - str_data = saveStream.str(); OUT_SAVE_INST_DATA_COMPLETE; @@ -534,7 +533,6 @@ public: }; - void AddSC_instance_gundrak() { new instance_gundrak(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 092919435e2..5b8d0e66206 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -140,7 +140,6 @@ public: summon->CastSpell(summon, SPELL_SUMMON_CORPSE_SCARABS_MOB, true, NULL, NULL, me->GetGUID()); } - void UpdateAI(const uint32 diff) { if (!UpdateVictim() || !CheckInRoom()) @@ -183,7 +182,6 @@ public: }; - void AddSC_boss_anubrekhan() { new boss_anubrekhan(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index b5660d369ab..7a1c1863937 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -175,7 +175,6 @@ public: }; - class mob_faerlina_add : public CreatureScript { public: @@ -215,7 +214,6 @@ public: }; - void AddSC_boss_faerlina() { new boss_faerlina(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 2ef6009b574..505938f1be9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -144,7 +144,6 @@ public: }; - void AddSC_boss_gluth() { new boss_gluth(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index c3bd60e82d3..bf37f218adc 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -582,8 +582,6 @@ public: }; - - void AddSC_boss_gothik() { new boss_gothik(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 1a59629dc9d..cb4e4b9f782 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -142,8 +142,6 @@ public: }; - - void AddSC_boss_grobbulus() { new boss_grobbulus(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 0c527ab6cd8..27d9f9757a6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -147,7 +147,6 @@ public: }; - void AddSC_boss_heigan() { new boss_heigan(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 8ef61afda59..292d3f16d2b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -92,7 +92,6 @@ public: }; - enum SporeSpells { SPELL_FUNGAL_CREEP = 29232 @@ -120,7 +119,6 @@ public: }; - void AddSC_boss_loatheb() { new boss_loatheb(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 30cb99f9260..f47b806e865 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -181,8 +181,6 @@ public: }; - - void AddSC_boss_maexxna() { new boss_maexxna(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 0cd4cee813c..1cd130556e9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -210,7 +210,6 @@ public: }; - void AddSC_boss_noth() { new boss_noth(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index a215e1dca83..42afc0e57a0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -159,7 +159,6 @@ public: }; - void AddSC_boss_patchwerk() { new boss_patchwerk(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 4fb2392b018..479fda3c875 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -135,7 +135,6 @@ public: }; - void AddSC_boss_razuvious() { new boss_razuvious(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index f28264d3910..0ce6f5e0829 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -395,7 +395,6 @@ public: }; - void AddSC_boss_sapphiron() { new boss_sapphiron(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 6a92440c891..9aabf5b315c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -254,7 +254,6 @@ public: }; - class mob_stalagg : public CreatureScript { public: @@ -341,7 +340,6 @@ public: }; - class mob_feugen : public CreatureScript { public: @@ -402,7 +400,6 @@ public: }; - void AddSC_boss_thaddius() { new boss_thaddius(); diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 4c08746e534..ee13dc23c43 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -382,7 +382,6 @@ public: }; - void AddSC_instance_naxxramas() { new instance_naxxramas(); diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index fe2141c3f28..fa5d138a428 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -185,7 +185,6 @@ public: }; - void AddSC_boss_malygos() { new boss_malygos(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 248be5f0e1e..ffdd038ace3 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -160,7 +160,6 @@ public: } } - if (uiSparkTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) @@ -174,7 +173,6 @@ public: }; - enum RiftSpells { SPELL_CHAOTIC_ENERGY_BURST = 47688, @@ -255,7 +253,6 @@ public: }; - void AddSC_boss_anomalus() { new boss_anomalus(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 325ad55ea7e..07a943a0234 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -223,7 +223,6 @@ public: }; - class containment_sphere : public GameObjectScript { public: diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index c5286bbd096..eaca718d419 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -324,7 +324,6 @@ public: }; - void AddSC_boss_magus_telestra() { new boss_magus_telestra(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 591ca8255a5..431740b8e08 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -301,9 +301,6 @@ public: }; - - - void AddSC_boss_ormorok() { new boss_ormorok(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp index ea33c65347d..12bf5dec0fc 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp @@ -68,7 +68,6 @@ public: }; - void AddSC_boss_commander_kolurg() { new boss_commander_kolurg(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp index 525461924c4..4d68eb61cc6 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp @@ -74,7 +74,6 @@ public: }; - void AddSC_boss_commander_stoutbeard() { new boss_commander_stoutbeard(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index ec621de9652..b861c824740 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -257,7 +257,6 @@ public: }; - void AddSC_instance_nexus() { new instance_nexus(); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 2511a509aaf..5e3cced7b5e 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -231,7 +231,6 @@ public: char dataHead1, dataHead2; - std::istringstream loadStream(in); loadStream >> dataHead1 >> dataHead2; @@ -266,7 +265,6 @@ public: }; - void AddSC_instance_oculus() { new instance_oculus(); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 373d9c99008..71313f54d59 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -174,7 +174,6 @@ public: }; - void AddSC_oculus() { new npc_oculus_drake(); diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp index 71c39917435..fd75d1d28ce 100644 --- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp @@ -116,7 +116,6 @@ enum eEnums SPELL_FLAME_TSUNAMI_DMG_AURA = 57491, // periodic damage, npc has this aura SPELL_FLAME_TSUNAMI_BUFF = 60430, - NPC_FLAME_TSUNAMI = 30616, // for the flame waves NPC_LAVA_BLAZE = 30643, // adds spawning from flame strike @@ -704,7 +703,6 @@ public: }; - enum TeneText { SAY_TENEBRON_AGGRO = -1615009, @@ -1084,7 +1082,6 @@ public: }; - /*###### ## Mob Shadron ######*/ @@ -1190,7 +1187,6 @@ public: }; - /*###### ## Mob Vesperon ######*/ @@ -1287,7 +1283,6 @@ public: }; - /*###### ## Mob Acolyte of Shadron ######*/ @@ -1398,7 +1393,6 @@ public: }; - /*###### ## Mob Acolyte of Vesperon ######*/ @@ -1494,7 +1488,6 @@ public: }; - /*###### ## Mob Twilight Eggs ######*/ @@ -1560,14 +1553,12 @@ public: m_uiHatchEggTimer -= uiDiff; } - void AttackStart(Unit* /*pWho*/) {} void MoveInLineOfSight(Unit* /*pWho*/) {} }; }; - /*###### ## Mob Flame Tsunami ######*/ @@ -1668,9 +1659,6 @@ public: }; - - - /*###### ## Mob Twilight Whelps ######*/ @@ -1722,7 +1710,6 @@ public: }; - void AddSC_boss_sartharion() { new boss_sartharion(); diff --git a/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp index d31bfb0e963..b955cd1209b 100644 --- a/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -140,7 +140,6 @@ public: }; - void AddSC_instance_obsidian_sanctum() { new instance_obsidian_sanctum(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 1d6bc93b78f..f2d972bb051 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -432,8 +432,6 @@ public: }; - - void AddSC_boss_bjarngrim() { new boss_bjarngrim(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index aec6e2295ae..9b9d7a38489 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -292,8 +292,6 @@ public: }; - - /*###### ## mob_spark_of_ionar ######*/ @@ -380,7 +378,6 @@ public: }; - void AddSC_boss_ionar() { new boss_ionar(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 285da7262a9..1b314ee3c9d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -220,7 +220,6 @@ public: }; - void AddSC_boss_loken() { new boss_loken(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index dbc688d850a..84f361bc821 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -251,7 +251,6 @@ public: }; - void AddSC_instance_halls_of_lightning() { new instance_halls_of_lightning(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 4940bdb60f9..1f11e7a254a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -186,7 +186,6 @@ public: }; - void AddSC_boss_krystallus() { new boss_krystallus(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 3a4c18ea0f8..5468837a711 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -176,7 +176,6 @@ public: }; - void AddSC_boss_maiden_of_grief() { new boss_maiden_of_grief(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 3f09d430f25..f286dd23f58 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -242,7 +242,6 @@ public: }; - class mob_malformed_ooze : public CreatureScript { public: @@ -286,7 +285,6 @@ public: }; - class mob_iron_sludge : public CreatureScript { public: @@ -316,7 +314,6 @@ public: }; - void AddSC_boss_sjonnir() { new boss_sjonnir(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 885462ea8d8..9fc0cc599d9 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -738,10 +738,6 @@ public: }; - - - - void AddSC_halls_of_stone() { new npc_brann_hos(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index 89a61326e58..30e7565f47d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -268,7 +268,6 @@ public: }; - void AddSC_instance_halls_of_stone() { new instance_halls_of_stone(); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp index 328a0b5789a..5293af733a1 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -313,7 +313,6 @@ public: } } - // TODO: effect 0 and effect 1 may be on different target void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) { @@ -321,7 +320,6 @@ public: AttackStart(pTarget); } - void JustDied(Unit* /*victim*/) { _JustDied(); @@ -837,7 +835,6 @@ public: }; - class spell_pool_of_tar : public CreatureScript { public: @@ -1007,7 +1004,6 @@ public: }; - class npc_hodirs_fury : public CreatureScript { public: @@ -1159,7 +1155,6 @@ public: pPlayer->PrepareGossipMenu(pCreature); instance->instance->LoadGrid(364,-16); //make sure leviathan is loaded - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_2,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2); pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp index 9755fe04ac9..382b88be6c8 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp @@ -84,7 +84,6 @@ public: }; - void AddSC_boss_hodir() { new boss_hodir(); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp index 1960ff2e4fa..bc593f70676 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp @@ -467,7 +467,6 @@ class spell_ignis_slag_pot : public SpellScriptLoader } }; - void AddSC_boss_ignis() { new boss_ignis(); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp index f733c2572dd..f510408b566 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp @@ -563,7 +563,6 @@ public: }; - class npc_mole_machine_trigger : public CreatureScript { public: @@ -628,7 +627,6 @@ public: }; - class npc_devouring_flame : public CreatureScript { public: @@ -655,7 +653,6 @@ public: }; - class npc_darkrune_watcher : public CreatureScript { public: @@ -709,7 +706,6 @@ public: }; - class npc_darkrune_guardian : public CreatureScript { public: @@ -754,7 +750,6 @@ public: }; - class npc_darkrune_sentinel : public CreatureScript { public: @@ -817,7 +812,6 @@ public: }; - void AddSC_boss_razorscale() { new boss_razorscale(); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp index 56c8ccae32f..a99927d5e50 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp @@ -99,7 +99,6 @@ public: }; - void AddSC_boss_thorim() { new boss_thorim(); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index 9cc39b28514..2af069977b0 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -140,7 +140,6 @@ enum //#define VOID_ZONE_DMG_25 7500 //#define VOID_ZONE_RADIUS - /************************************************ -----------------SPAWN LOCATIONS----------------- ************************************************/ @@ -624,7 +623,6 @@ public: }; - /*------------------------------------------------------- * * XM-024 PUMMELLER @@ -691,7 +689,6 @@ public: }; - /*------------------------------------------------------- * * XE-321 BOOMBOT @@ -747,7 +744,6 @@ public: }; - /*------------------------------------------------------- * * VOID ZONE @@ -811,7 +807,6 @@ public: }; - /*------------------------------------------------------- * * LIFE SPARK diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index f866bd3b746..26ffd7cff70 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -466,7 +466,6 @@ public: }; - void AddSC_instance_ulduar() { new instance_ulduar(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 29b6a836c2c..a32c68fdf3b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -272,7 +272,6 @@ public: }; - enum eSpells { //we don't have that text in db so comment it until we get this text @@ -392,7 +391,6 @@ public: }; }; - enum eShadowAxe { SPELL_SHADOW_AXE_DAMAGE = 42750, @@ -445,7 +443,6 @@ public: }; - void AddSC_boss_ingvar_the_plunderer() { new boss_ingvar_the_plunderer(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 0a9d3711711..1e874b3d5ee 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -362,9 +362,6 @@ public: }; - - - void AddSC_boss_keleseth() { new boss_keleseth(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index d6e2b078a5a..dd5fb2a6c82 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -209,7 +209,6 @@ public: }; - class boss_dalronn_the_controller : public CreatureScript { public: @@ -397,7 +396,6 @@ public: }; - void AddSC_boss_skarvald_dalronn() { new boss_skarvald_the_constructor(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index f5205bab39c..6b2443b8d72 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -308,7 +308,6 @@ public: }; - void AddSC_instance_utgarde_keep() { new instance_utgarde_keep(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 4ac6863e303..5f3a93e0d57 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -155,7 +155,6 @@ public: }; - void AddSC_utgarde_keep() { new npc_dragonflayer_forge_master(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 41ff2f1e191..04d7a38b4c0 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -276,7 +276,6 @@ public: }; - //ravenous furbolg's spells enum RavenousSpells { @@ -390,7 +389,6 @@ public: }; - //frenzied worgen's spells enum FrenziedSpells { @@ -506,7 +504,6 @@ public: }; - //ferocious rhino's spells enum FerociousSpells { @@ -622,7 +619,6 @@ public: }; - //massive jormungar's spells enum MassiveSpells { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index c6d498ad246..b2f98b11475 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -302,7 +302,6 @@ public: } } - void UpdateAI(const uint32 diff) { switch(Phase) @@ -476,7 +475,6 @@ public: }; - void AddSC_boss_skadi() { new boss_skadi(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 6387cfc8727..31ca69c11c3 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -159,7 +159,6 @@ public: }; - void AddSC_boss_cyanigosa() { new boss_cyanigosa(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 78e6404c753..1e540c09220 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -251,7 +251,6 @@ public: }; - enum GuardSpells { SPELL_GUSHING_WOUND = 39215, @@ -334,7 +333,6 @@ public: }; - void AddSC_boss_erekem() { new boss_erekem(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 7b8d72194bd..b6db8eaf8f6 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -311,7 +311,6 @@ public: } } - void SummonedCreatureDespawn(Creature *pSummoned) { if (pSummoned) @@ -331,7 +330,6 @@ public: }; - class mob_ichor_globule : public CreatureScript { public: @@ -396,7 +394,6 @@ public: }; - void AddSC_boss_ichoron() { new boss_ichoron(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 61705af6ed4..65de6aef578 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -157,7 +157,6 @@ public: }; - void AddSC_boss_lavanthor() { new boss_lavanthor(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index e2f24f22aa0..2ef3a9b6df6 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -135,7 +135,6 @@ public: }; - void AddSC_boss_moragg() { new boss_moragg(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index f546b0b0c21..19aea5f8769 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -224,7 +224,6 @@ public: }; - class mob_ethereal_sphere : public CreatureScript { public: @@ -302,7 +301,6 @@ public: }; - void AddSC_boss_xevozz() { new boss_xevozz(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 3621941d0e9..9ed5d005321 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -184,7 +184,6 @@ public: }; - void AddSC_boss_zuramat() { new boss_zuramat(); diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index a6d6e3e4f39..ebc634422e1 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -813,7 +813,6 @@ public: }; }; - void AddSC_instance_violet_hold() { new instance_violet_hold(); diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 012d67f1846..cd6a0c66641 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -414,9 +414,6 @@ public: }; - - - class mob_azure_saboteur : public CreatureScript { public: @@ -541,7 +538,6 @@ public: }; - class npc_teleportation_portal_vh : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/dragonblight.cpp b/src/server/scripts/Northrend/dragonblight.cpp index a2eac466350..7c86de5eefe 100644 --- a/src/server/scripts/Northrend/dragonblight.cpp +++ b/src/server/scripts/Northrend/dragonblight.cpp @@ -73,7 +73,6 @@ public: ## npc_inquisitor_hallard. Quest 12321 ######*/ - enum eInquisitor { NPC_GODFREY = 27577, diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index fd24055976e..568b9e848a9 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -102,7 +102,6 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const { return new npc_drakuru_shacklesAI(creature); @@ -876,7 +875,6 @@ public: pSummoner->MonsterYell(sText.c_str(),LANG_UNIVERSAL,0); } - if (Player* pPlayer = pKiller->GetCharmerOrOwnerPlayerOrPlayerItself()) { pPlayer->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_YGGDRAS_1, pKiller); -- cgit v1.2.3