diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-03-21 10:52:14 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-03-21 10:52:14 +0100 |
| commit | 2f79b0f266e48778f13f9e183b41bfd8baa6f8bd (patch) | |
| tree | 24d015e1cd21d43393e690ce624db3dda9b3ed73 /src/server | |
| parent | f8162d609ba2d010fadaed56a0dc51df17c3b7a1 (diff) | |
Core: Removed all double (and more) empty lines
Diffstat (limited to 'src/server')
353 files changed, 2 insertions, 799 deletions
diff --git a/src/server/authserver/Server/RealmSocket.cpp b/src/server/authserver/Server/RealmSocket.cpp index 299dd450994..c80b2c4f08f 100755 --- a/src/server/authserver/Server/RealmSocket.cpp +++ b/src/server/authserver/Server/RealmSocket.cpp @@ -276,7 +276,6 @@ int RealmSocket::handle_input(ACE_HANDLE) return n == space ? 1 : 0; } - void RealmSocket::set_session(Session* session) { if (session_ != NULL) diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp index f447e74901e..cd4c74d2ead 100644 --- a/src/server/collision/Maps/MapTree.cpp +++ b/src/server/collision/Maps/MapTree.cpp @@ -89,7 +89,6 @@ namespace VMAP bool result; }; - //========================================================= std::string StaticMapTree::getTileFileName(uint32 mapID, uint32 tileX, uint32 tileY) diff --git a/src/server/collision/Models/ModelInstance.h b/src/server/collision/Models/ModelInstance.h index 844c71cac51..289fd5ff3fe 100755 --- a/src/server/collision/Models/ModelInstance.h +++ b/src/server/collision/Models/ModelInstance.h @@ -56,7 +56,6 @@ namespace VMAP // temp? const G3D::AABox& getBounds() const { return iBound; } - static bool readFromFile(FILE *rf, ModelSpawn &spawn); static bool writeToFile(FILE *rw, const ModelSpawn &spawn); }; diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp index ce93ec78557..f639b5fc3f4 100644 --- a/src/server/collision/Models/WorldModel.cpp +++ b/src/server/collision/Models/WorldModel.cpp @@ -28,7 +28,6 @@ template<> struct BoundsTrait<VMAP::GroupModel> static void getBounds(const VMAP::GroupModel& obj, G3D::AABox& out) { out = obj.GetBound(); } }; - namespace VMAP { bool IntersectTriangle(const MeshTriangle &tri, std::vector<Vector3>::const_iterator points, const G3D::Ray &ray, float &distance) diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp index d1c30a76932..008ec447f6a 100755 --- a/src/server/game/AI/CoreAI/CombatAI.cpp +++ b/src/server/game/AI/CoreAI/CombatAI.cpp @@ -298,7 +298,6 @@ VehicleAI::VehicleAI(Creature *c) : CreatureAI(c), m_vehicle(c->GetVehicleKit()) m_DismissTimer = VEHICLE_DISMISS_TIME; } - //NOTE: VehicleAI::UpdateAI runs even while the vehicle is mounted void VehicleAI::UpdateAI(const uint32 diff) { diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp index 5715e6fde1c..ecff2d2a031 100755 --- a/src/server/game/AI/CoreAI/GuardAI.cpp +++ b/src/server/game/AI/CoreAI/GuardAI.cpp @@ -35,7 +35,6 @@ GuardAI::GuardAI(Creature* creature) : ScriptedAI(creature), i_victimGuid(0), i_ { } - bool GuardAI::CanSeeAlways(WorldObject const* obj) { if (!obj->isType(TYPEMASK_UNIT)) @@ -139,7 +138,6 @@ void GuardAI::UpdateAI(const uint32 /*diff*/) } } - void GuardAI::JustDied(Unit* killer) { if (Player* pkiller = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 87eb6db4ae2..92a2227fe8b 100755 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -34,7 +34,6 @@ void CreatureAI::OnCharmed(bool /*apply*/) AISpellInfoType * UnitAI::AISpellInfo; AISpellInfoType * GetAISpellInfo(uint32 i) { return &CreatureAI::AISpellInfo[i]; } - void CreatureAI::Talk(uint8 id, uint64 WhisperGuid) { sCreatureTextMgr->SendChat(me, id, WhisperGuid); diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp index 8a7f20e8687..93eb293e1bd 100755 --- a/src/server/game/AI/EventAI/CreatureEventAI.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp @@ -870,14 +870,12 @@ void CreatureEventAI::Reset() if (m_bEmptyList) return; - for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i) { if ((*i).Event.event_type == EVENT_T_RESET) ProcessEvent(*i); } - //Reset all events to enabled for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i) { diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index cc8bdc00d12..c88494f9c4b 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -15,7 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ - #include "DatabaseEnv.h" #include "SQLStorage.h" #include "ObjectMgr.h" @@ -211,7 +210,6 @@ void SmartAI::EndPath(bool fail) else GetScript()->SetPathId(0); - ObjectList* targets = GetScript()->GetTargetList(SMART_ESCORT_TARGETS); if (targets && mEscortQuestID) { diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 766dab15701..3603c61fb69 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -15,7 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ - #include "DatabaseEnv.h" #include "SQLStorage.h" #include "ObjectMgr.h" @@ -2472,7 +2471,6 @@ void SmartScript::UpdateAIWhileCharmed(const uint32 diff) { } - void SmartScript::DoAction(const int32 param) { } @@ -2513,7 +2511,6 @@ uint32 SmartScript::DoChat(int8 id, uint64 whisperGuid) }*/ // SmartScript end - Unit* SmartScript::DoSelectLowestHpFriendly(float range, uint32 MinHPDiff) { if (!me) return NULL; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 31fedb11699..7d274448f39 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -15,7 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ - #include "DatabaseEnv.h" #include "SQLStorage.h" #include "ObjectMgr.h" @@ -63,7 +62,6 @@ void SmartWaypointMgr::LoadFromDB() y = fields[3].GetFloat(); z = fields[4].GetFloat(); - WayPoint *wp = new WayPoint(id, x, y, z); if (last_entry != entry) @@ -584,7 +582,6 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder &e) break; - case SMART_ACTION_SET_EVENT_PHASE: if (e.action.setEventPhase.phase >= SMART_EVENT_PHASE_MAX) { diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 01568ee41f0..7095acb8c30 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -692,7 +692,6 @@ struct SmartAction uint32 id; } taxi; - struct { uint32 run; @@ -762,7 +761,6 @@ struct SmartAction uint32 id; } storeTargets; - struct { uint32 id; diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index ecfd765f2d7..4dc1ad914a1 100755 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -2457,7 +2457,6 @@ void AchievementGlobalMgr::LoadRewardLocales() return; } - do { Field *fields = result->Fetch(); diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index fff0509935a..fa8381e1ae2 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -304,7 +304,6 @@ void AuctionHouseMgr::SendAuctionCancelledToBidderMail(AuctionEntry* auction, SQ } } - void AuctionHouseMgr::LoadAuctionItems() { uint32 oldMSTime = getMSTime(); @@ -374,7 +373,6 @@ void AuctionHouseMgr::LoadAuctions() { Field* fields = result->Fetch(); - AuctionEntry *aItem = new AuctionEntry(); if (!aItem->LoadFromDB(fields)) { diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index 0a88d839d10..85f72f28c06 100755 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -812,7 +812,6 @@ void Battleground::EndBattleground(uint32 winner) UpdatePlayerScore(plr, SCORE_BONUS_HONOR, GetBonusHonorFromKill(loser_kills)); } - plr->ResetAllPowers(); plr->CombatStopWithPets(true); diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index e5603075b18..32eb0a16367 100755 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -21,7 +21,6 @@ #include "World.h" #include "WorldPacket.h" - #include "ArenaTeam.h" #include "BattlegroundMgr.h" #include "BattlegroundAV.h" diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index ae6ad0bce45..f15a58f74d5 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -1490,4 +1490,3 @@ void BattlegroundAV::ResetBGSubclass() } - diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp index 1658f768d56..c4e5189998e 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp @@ -171,7 +171,6 @@ void BattlegroundDS::Reset() Battleground::Reset(); } - bool BattlegroundDS::SetupBattleground() { // gates diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h index 577c46acfcd..df702d317e3 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h @@ -908,7 +908,6 @@ class BattlegroundIC : public Battleground Transport* gunshipAlliance; Transport* gunshipHorde; - uint32 GetNextBanner(ICNodePoint* nodePoint,uint32 team, bool returnDefinitve); uint32 GetGateIDFromEntry(uint32 id) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp index c6ec4241726..0a74cec74a9 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp @@ -167,7 +167,6 @@ bool BattlegroundRV::HandlePlayerUnderMap(Player *player) return true; } - void BattlegroundRV::HandleAreaTrigger(Player *Source, uint32 Trigger) { if (GetStatus() != STATUS_IN_PROGRESS) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index 1bd35caf41f..07799c43fc7 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -24,7 +24,6 @@ #include "ObjectMgr.h" #include "WorldPacket.h" - BattlegroundSA::BattlegroundSA() { m_StartMessageIds[BG_STARTING_EVENT_FIRST] = LANG_BG_SA_START_TWO_MINUTES; @@ -70,7 +69,6 @@ bool BattlegroundSA::ResetObjs() uint32 atF = BG_SA_Factions[Attackers]; uint32 defF = BG_SA_Factions[Attackers ? TEAM_ALLIANCE : TEAM_HORDE]; - for (uint8 i = 0; i <BG_SA_MAXOBJ; i++) DelObject(i); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h index 51e3145fd4e..61d17b37941 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h @@ -72,7 +72,6 @@ enum BG_SA_WorldStates BG_SA_YELLOW_GATEWS = 3638, BG_SA_ANCIENT_GATEWS = 3849, - BG_SA_LEFT_GY_ALLIANCE = 3635, BG_SA_RIGHT_GY_ALLIANCE = 3636, BG_SA_CENTER_GY_ALLIANCE = 3637, @@ -485,7 +484,6 @@ class BattlegroundSA : public Battleground void RemovePlayer(Player *plr,uint64 guid); void HandleAreaTrigger(Player *Source, uint32 Trigger); - /* Scorekeeping */ /// Update score board void UpdatePlayerScore(Player *Source, uint32 type, uint32 value, bool doAddHonor = true); @@ -542,7 +540,6 @@ class BattlegroundSA : public Battleground /// Send packet to player for destroy boats (client part) void SendTransportsRemove(Player * player); - /// Id of attacker team TeamId Attackers; /// Totale elapsed time of current round diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index afe487b2c1b..692067b3dc3 100755 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -141,7 +141,6 @@ void Channel::CleanOldChannelsInDB() } } - void Channel::Join(uint64 p, const char *pass) { WorldPacket data; diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp index c0dd068aba2..d657781499f 100755 --- a/src/server/game/Chat/Commands/Level3.cpp +++ b/src/server/game/Chat/Commands/Level3.cpp @@ -4453,7 +4453,6 @@ bool ChatHandler::HandleChannelSetOwnership(const char *args) return true; } - /*------------------------------------------ *-------------TRINITY---------------------- *-------------------------------------*/ diff --git a/src/server/game/Combat/HostileRefManager.cpp b/src/server/game/Combat/HostileRefManager.cpp index c7b40a9119d..91ba2d69037 100755 --- a/src/server/game/Combat/HostileRefManager.cpp +++ b/src/server/game/Combat/HostileRefManager.cpp @@ -69,7 +69,6 @@ void HostileRefManager::addTempThreat(float fThreat, bool apply) } } - //================================================= void HostileRefManager::addThreatPercent(int32 iPercent) diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 8b7385d8d89..ca93b89ca88 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -17,7 +17,6 @@ */ - #include "Player.h" #include "SpellAuras.h" #include "SpellMgr.h" @@ -375,7 +374,6 @@ void ConditionMgr::LoadConditions(bool isReload) sObjectMgr->LoadGossipMenuItems(); } - QueryResult result = WorldDatabase.Query("SELECT SourceTypeOrReferenceId, SourceGroup, SourceEntry, ElseGroup, ConditionTypeOrReference," " ConditionValue1, ConditionValue2, ConditionValue3, ErrorTextId, ScriptName FROM conditions"); @@ -1408,7 +1406,6 @@ void ConditionMgr::Clean() m_ConditionMap.clear(); - for (VehicleSpellConditionMap::iterator itr = m_VehicleSpellConditions.begin(); itr != m_VehicleSpellConditions.end(); ++itr) { for (ConditionTypeMap::iterator it = itr->second.begin(); it != itr->second.end(); ++it) diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 04d8f9be705..ac5c43dcefa 100755 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -54,7 +54,6 @@ void DisableMgr::LoadDisables() return; } - Field* fields; do { diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index d8c86c8b7a8..026df42d61c 100755 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -1234,7 +1234,6 @@ struct MapDifficultyEntry //char* difficultyString; // 22 }; - struct MovieEntry { uint32 Id; // 0 index @@ -1680,7 +1679,6 @@ struct StableSlotPricesEntry uint32 Price; }; - struct SummonPropertiesEntry { uint32 Id; // 0 @@ -1691,7 +1689,6 @@ struct SummonPropertiesEntry uint32 Flags; // 5 }; - #define MAX_TALENT_RANK 5 #define MAX_PET_TALENT_RANK 3 // use in calculations, expected <= MAX_TALENT_RANK #define MAX_TALENT_TABS 3 diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index ab584515dcf..827da373ac7 100755 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -1885,7 +1885,6 @@ std::string LFGMgr::ConcatenateGuids(LfgGuidList check) return o.str(); } - LfgState LFGMgr::GetState(const uint64& guid) { sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetState: [" UI64FMTD "]", guid); diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index 493bed3305b..2a2850a5b08 100755 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -115,7 +115,6 @@ enum LfgAnswer LFG_ANSWER_AGREE = 1 }; - // Forward declaration (just to have all typedef together) struct LfgReward; struct LfgLockStatus; @@ -210,7 +209,6 @@ struct LfgProposalPlayer uint32 groupLowGuid; ///< Original group guid (Low guid) 0 if no original group }; - /// Stores group data related to proposal to join struct LfgProposal { diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index d80ca4cf919..4d6f90dca4c 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -122,7 +122,6 @@ void LFGScripts::OnChangeLeader(Group* group, uint64 newLeaderGuid, uint64 oldLe if (plr) plr->GetSession()->SendLfgUpdateParty(updateData); - plr = sObjectMgr->GetPlayer(oldLeaderGuid); if (plr) { diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 9b9d006b6bf..07a2ce1b886 100755 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -49,7 +49,6 @@ #include "Group.h" // apply implementation of the singletons - TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const { TrainerSpellMap::const_iterator itr = spellList.find(spell_id); diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 4c85977aec5..82ad16cc624 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -827,7 +827,6 @@ bool GameObject::IsDynTransport() const return gInfo->type == GAMEOBJECT_TYPE_MO_TRANSPORT || (gInfo->type == GAMEOBJECT_TYPE_TRANSPORT && !gInfo->transport.pause); } - Unit* GameObject::GetOwner() const { return ObjectAccessor::GetUnit(*this, GetOwnerGUID()); diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index c483f72a58d..29dff322631 100755 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -767,7 +767,6 @@ bool Item::CanBeTraded(bool mail, bool trade) const return true; } - bool Item::HasEnchantRequiredSkill(const Player *pPlayer) const { @@ -781,7 +780,6 @@ bool Item::HasEnchantRequiredSkill(const Player *pPlayer) const return true; } - uint32 Item::GetEnchantRequiredLevel() const { diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1d4de33e6d0..6465b00d05b 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -15170,7 +15170,6 @@ bool Player::SatisfyQuestPreviousQuest(Quest const* qInfo, bool msg) return true; } - // If any of the negative previous quests active, return true if (*iter < 0 && GetQuestStatus(prevId) != QUEST_STATUS_NONE) { @@ -21721,7 +21720,6 @@ void Player::SetDailyQuestStatus(uint32 quest_id) } } - void Player::SetWeeklyQuestStatus(uint32 quest_id) { m_weeklyquests.insert(quest_id); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 994326aa9c3..fad6eb8a706 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -312,7 +312,6 @@ void Unit::SendMonsterMoveWithSpeedToCurrentDestination(Player* player) SendMonsterMoveWithSpeed(x, y, z, 0, player); } - void Unit::SendMonsterMoveWithSpeed(float x, float y, float z, uint32 transitTime, Player* player) { if (!transitTime) @@ -3720,7 +3719,6 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit else RemoveAuraFromStack(iter, AURA_REMOVE_BY_ENEMY_SPELL); - if (Aura * newAura = stealCharge ? stealer->GetAura(aura->GetId(), aura->GetCasterGUID()) : NULL) { uint8 newCharges = newAura->GetCharges() + 1; @@ -3836,7 +3834,6 @@ void Unit::RemoveNotOwnSingleTargetAuras(uint32 newPhase) } } - void Unit::RemoveAurasWithInterruptFlags(uint32 flag, uint32 except) { if (!(m_interruptMask & flag)) @@ -11104,7 +11101,6 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint if (AuraEffect const* Tenacity = pVictim->GetAuraEffect(58549, 0)) AddPctN(TakenTotalMod, Tenacity->GetAmount()); - // Healing taken percent float minval = (float)pVictim->GetMaxNegativeAuraModifier(SPELL_AURA_MOD_HEALING_PCT); if (minval) @@ -12655,7 +12651,6 @@ Unit* Creature::SelectVictim() return target; } - Unit::AuraEffectList const& iAuras = GetAuraEffectsByType(SPELL_AURA_MOD_INVISIBILITY); if(!iAuras.empty()) { diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index dcfc8ab4364..5cb2ddb4db0 100755 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1380,7 +1380,6 @@ class Unit : public WorldObject void CalculateSpellDamageTaken(SpellNonMeleeDamage *damageInfo, int32 damage, SpellEntry const *spellInfo, WeaponAttackType attackType = BASE_ATTACK, bool crit = false); void DealSpellDamage(SpellNonMeleeDamage *damageInfo, bool durabilityLoss); - // player or player's pet resilience (-1%) float GetMeleeCritChanceReduction() const { return GetCombatRatingReduction(CR_CRIT_TAKEN_MELEE); } float GetRangedCritChanceReduction() const { return GetCombatRatingReduction(CR_CRIT_TAKEN_RANGED); } diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index f5efdd3bad1..65c06b56049 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -244,7 +244,6 @@ void Vehicle::InstallAccessory(uint32 entry, int8 seatId, bool minion, uint8 typ if (minion) accessory->AddUnitTypeMask(UNIT_MASK_ACCESSORY); - if (!me->HandleSpellClick(accessory, seatId)) { accessory->AddObjectToRemoveList(); diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index 9b7b0f7d9d1..413d2e24bf2 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -77,7 +77,6 @@ enum VehicleSpells VEHICLE_SPELL_PARACHUTE = 45472 }; - struct VehicleSeat { explicit VehicleSeat(VehicleSeatEntry const *_seatInfo) : seatInfo(_seatInfo), passenger(NULL) {} diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 7e78b70e5a3..a857bd94965 100755 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -358,7 +358,6 @@ void GameEventMgr::LoadFromDB() } } - sLog->outString("Loading Game Event Creature Data..."); { uint32 oldMSTime = getMSTime(); diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h index 532a330d094..9c806063721 100755 --- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h +++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h @@ -27,7 +27,6 @@ #include "CreatureAI.h" #include "SpellAuras.h" - template<class T> inline void Trinity::VisibleNotifier::Visit(GridRefManager<T> &m) diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 2fe5e19a11b..7d65363bbce 100755 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1689,7 +1689,6 @@ InstanceGroupBind* Group::GetBoundInstance(MapEntry const* mapEntry) return NULL; } - InstanceGroupBind* Group::BindToInstance(InstanceSave *save, bool permanent, bool load) { if (!save || isBGGroup()) @@ -1922,7 +1921,6 @@ void Group::SetBattlegroundGroup(Battleground *bg) m_bgGroup = bg; } - void Group::SetGroupMemberFlag(uint64 guid, const bool &apply, GroupMemberFlags flag) { // Assistants, main assistants and main tanks are only available in raid groups diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index 0956faeaa20..8653db0fa7b 100755 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -67,7 +67,6 @@ MailSender::MailSender(Player* sender) m_senderId = sender->GetGUIDLow(); } - MailReceiver::MailReceiver(Player* receiver) : m_receiver(receiver), m_receiver_lowguid(receiver->GetGUIDLow()) { } diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index 24c4114f230..56b9dfe2239 100755 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -25,7 +25,6 @@ enum TrinityStrings LANG_SELECT_CHAR_OR_CREATURE = 1, LANG_SELECT_CREATURE = 2, - // level 0 chat LANG_SYSTEMMESSAGE = 3, LANG_EVENTMESSAGE = 4, @@ -951,7 +950,6 @@ enum TrinityStrings LANG_MAIL_SENDER_REQ = 6611, LANG_MAIL_RECEIVER_REQ = 6612, - // Used for GM Announcements LANG_GM_BROADCAST = 6613, LANG_GM_NOTIFY = 6614, diff --git a/src/server/game/Movement/MovementGenerator.cpp b/src/server/game/Movement/MovementGenerator.cpp index fd5a840a66e..eee874f05ac 100755 --- a/src/server/game/Movement/MovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerator.cpp @@ -22,4 +22,3 @@ MovementGenerator::~MovementGenerator() { } - diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h index 67e280fc23e..5934a14d9be 100755 --- a/src/server/game/Movement/MovementGenerator.h +++ b/src/server/game/Movement/MovementGenerator.h @@ -97,4 +97,3 @@ typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderReg typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRepository MovementGeneratorRepository; #endif - diff --git a/src/server/game/Movement/MovementGeneratorImpl.h b/src/server/game/Movement/MovementGeneratorImpl.h index a6a7dab8737..6e6bf4b6e62 100755 --- a/src/server/game/Movement/MovementGeneratorImpl.h +++ b/src/server/game/Movement/MovementGeneratorImpl.h @@ -29,4 +29,3 @@ MovementGeneratorFactory<MOVEMENT_GEN>::Create(void * /*data*/) const } #endif - diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp index 91e24a167cc..9b4cf3f1231 100755 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp @@ -182,4 +182,3 @@ template void ConfusedMovementGenerator<Creature>::Reset(Creature &creature); template bool ConfusedMovementGenerator<Player>::Update(Player &player, const uint32 &diff); template bool ConfusedMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff); - diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h index ba234e936ef..597a85af530 100755 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h @@ -54,4 +54,3 @@ class ConfusedMovementGenerator }; #endif - diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h index df04eacbafa..2cccb99f81e 100755 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h @@ -78,4 +78,3 @@ class TimedFleeingMovementGenerator #endif - diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp index 5868ca0defb..461d27461fb 100755 --- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp @@ -94,4 +94,3 @@ HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff return true; } - diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h index 8b2a38d52d5..82284bee0ce 100755 --- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h @@ -55,4 +55,3 @@ class HomeMovementGenerator<Creature> }; #endif - diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h index 0b9604ff0ba..12eb40777ed 100755 --- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h @@ -77,4 +77,3 @@ class AssistanceDistractMovementGenerator : public DistractMovementGenerator #endif - diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h index 64bd51406e1..03c547b5cdc 100755 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h @@ -63,4 +63,3 @@ class AssistanceMovementGenerator #endif - diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp index 83e0f86f16d..9918ad579b0 100755 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -198,4 +198,3 @@ RandomMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff return true; } - diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h index 959d00606de..b7d7c7196d6 100755 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h @@ -51,4 +51,3 @@ class RandomMovementGenerator }; #endif - diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index a6fddd0d098..8080b842e52 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -275,4 +275,3 @@ template bool TargetedMovementGenerator<Creature>::Update(Creature &, const uint template Unit* TargetedMovementGenerator<Player>::GetTarget() const; template Unit* TargetedMovementGenerator<Creature>::GetTarget() const; - diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h index 60e00d67645..60ced2e8e41 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h @@ -71,4 +71,3 @@ class TargetedMovementGenerator }; #endif - diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp index 5e5a7dc69ca..e3599b73cbd 100755 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp @@ -367,7 +367,6 @@ void FlightPathMovementGenerator::DoEventIfAny(Player& player, TaxiPathNodeEntry } - // // Unique1's ASTAR Pathfinding Code... For future use & reference... // @@ -694,4 +693,3 @@ int GetFCost(int to, int num, int parentNum, float *gcost) } #endif //__PATHFINDING__ - diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h index 8e6b5ec877c..3139f8cf104 100755 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h @@ -129,4 +129,3 @@ public PathMovementBase<Player,TaxiPathNodeList const*> }; #endif - diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index c9c37203418..fe79583ce52 100755 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -721,7 +721,6 @@ void PoolMgr::LoadFromDB() } } - // Pool of pools sLog->outString("Loading Mother Pooling Data..."); diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index cb1b2c8a81e..1076efe82d8 100755 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -17,7 +17,6 @@ #include "ScriptLoader.h" - //examples void AddSC_example_creature(); void AddSC_example_escort(); diff --git a/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp b/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp index 12f459741ef..51ca4d9d959 100755 --- a/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp @@ -601,7 +601,6 @@ void WorldSession::HandleAreaSpiritHealerQueryOpcode(WorldPacket & recv_data) sBattlegroundMgr->SendAreaSpiritHealerQueryOpcode(_player, bg, guid); } - void WorldSession::HandleAreaSpiritHealerQueueOpcode(WorldPacket & recv_data) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_AREA_SPIRIT_HEALER_QUEUE"); @@ -622,7 +621,6 @@ void WorldSession::HandleAreaSpiritHealerQueueOpcode(WorldPacket & recv_data) bg->AddPlayerToResurrectQueue(guid, _player->GetGUID()); } - void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recv_data) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_BATTLEMASTER_JOIN_ARENA"); diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp index caab8144ff3..e220eaae2bd 100755 --- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp @@ -1658,7 +1658,6 @@ void WorldSession::HandleMoveSetCanFlyAckOpcode(WorldPacket & recv_data) uint64 guid; // guid - unused recv_data.readPackGUID(guid); - recv_data.read_skip<uint32>(); // unk MovementInfo movementInfo; diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 17f7498f1b8..b2f6526b217 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -6418,7 +6418,6 @@ void AuraEffect::HandleAuraModFaction(AuraApplication const * aurApp, uint8 mode } } - void AuraEffect::HandleComprehendLanguage(AuraApplication const * aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index bb9c4a8a412..ff83372d96f 100755 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -789,7 +789,6 @@ bool Aura::ModStackAmount(int32 num) return false; } - bool Aura::IsPassive() const { return IsPassiveSpell(GetSpellProto()); @@ -1829,7 +1828,6 @@ void Aura::CallScriptEffectAfterAbsorbHandlers(AuraEffect * aurEff, AuraApplicat } } - void Aura::CallScriptEffectManaShieldHandlers(AuraEffect * aurEff, AuraApplication const * aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount, bool & defaultPrevented) { for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 10c7d41caca..10edae93467 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1659,7 +1659,6 @@ void Spell::EffectForceCastWithValue(SpellEffIndex effIndex) caster->CastCustomSpell(unitTarget, spellInfo->Id, &bp, &bp, &bp, true, NULL, NULL, m_originalCasterGUID); } - void Spell::EffectTriggerSpell(SpellEffIndex effIndex) { // only unit case known diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 00a624980fb..a344f58d0d2 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1131,7 +1131,6 @@ void SpellMgr::LoadSpellTargetPositions() { Field *fields = result->Fetch(); - uint32 Spell_ID = fields[0].GetUInt32(); SpellTargetPosition st; @@ -1271,7 +1270,6 @@ void SpellMgr::LoadSpellProcEvents() { Field *fields = result->Fetch(); - uint32 entry = fields[0].GetUInt32(); const SpellEntry *spell = sSpellStore.LookupEntry(entry); @@ -1501,20 +1499,17 @@ void SpellMgr::LoadSpellGroups() { - sLog->outString(); sLog->outString(">> Loaded %u spell group definitions", count); return; } - std::set<uint32> groups; do { Field *fields = result->Fetch(); - uint32 group_id = fields[0].GetUInt32(); if (group_id <= SPELL_GROUP_DB_RANGE_MIN && group_id >= SPELL_GROUP_CORE_RANGE_MAX) { @@ -1588,18 +1583,15 @@ void SpellMgr::LoadSpellGroupStackRules() if (!result) { - sLog->outString(">> Loaded 0 spell group stack rules"); sLog->outString(); return; } - do { Field *fields = result->Fetch(); - uint32 group_id = fields[0].GetUInt32(); uint8 stack_rule = fields[1].GetUInt32(); if (stack_rule >= SPELL_GROUP_STACK_RULE_MAX) @@ -1639,18 +1631,15 @@ void SpellMgr::LoadSpellThreats() { - sLog->outString(">> Loaded %u aggro generating spells", count); sLog->outString(); return; } - do { Field *fields = result->Fetch(); - uint32 entry = fields[0].GetUInt32(); uint16 Threat = fields[1].GetUInt16(); @@ -2106,7 +2095,6 @@ void SpellMgr::LoadSpellPetAuras() { Field *fields = result->Fetch(); - uint32 spell = fields[0].GetUInt32(); uint8 eff = fields[1].GetUInt8(); uint32 pet = fields[2].GetUInt32(); @@ -2158,7 +2146,6 @@ void SpellMgr::LoadPetLevelupSpellMap() uint32 count = 0; uint32 family_count = 0; - for (uint32 i = 0; i < sCreatureFamilyStore.GetNumRows(); ++i) { @@ -2265,7 +2252,6 @@ void SpellMgr::LoadPetDefaultSpells() uint32 countCreature = 0; uint32 countData = 0; - for (uint32 i = 0; i < sCreatureStorage.MaxEntry; ++i) { @@ -2299,7 +2285,6 @@ void SpellMgr::LoadPetDefaultSpells() sLog->outString("Loading summonable creature templates..."); oldMSTime = getMSTime(); - // different summon spells for (uint32 i = 0; i < sSpellStore.GetNumRows(); ++i) { @@ -2339,7 +2324,6 @@ void SpellMgr::LoadPetDefaultSpells() } } - sLog->outString(">> Loaded %u summonable creature templates in %u ms", countCreature, GetMSTimeDiffToNow(oldMSTime)); sLog->outString(); } @@ -2463,7 +2447,6 @@ void SpellMgr::LoadSpellAreas() { Field *fields = result->Fetch(); - uint32 spell = fields[0].GetUInt32(); SpellArea spellArea; spellArea.spellId = spell; @@ -3273,7 +3256,6 @@ void SpellMgr::LoadSpellEnchantProcData() if (!result) { - sLog->outString(">> Loaded %u spell enchant proc event conditions", count); sLog->outString(); return; @@ -3283,7 +3265,6 @@ void SpellMgr::LoadSpellEnchantProcData() { Field *fields = result->Fetch(); - uint32 enchantId = fields[0].GetUInt32(); SpellItemEnchantmentEntry const *ench = sSpellItemEnchantmentStore.LookupEntry(enchantId); @@ -3383,7 +3364,6 @@ void SpellMgr::LoadSpellRanks() return; } - uint32 rows = 0; bool finished = false; @@ -4164,7 +4144,6 @@ void SpellMgr::LoadEnchantCustomAttr() uint32 size = sSpellItemEnchantmentStore.GetNumRows(); mEnchantCustomAttr.resize(size); - uint32 count = 0; for (uint32 i = 0; i < size; ++i) @@ -4221,7 +4200,6 @@ void SpellMgr::LoadSpellLinked() { Field *fields = result->Fetch(); - int32 trigger = fields[0].GetInt32(); int32 effect = fields[1].GetInt32(); int32 type = fields[2].GetInt32(); diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 031b77f0bd6..596223866eb 100755 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -131,12 +131,10 @@ enum SpellFamilyFlag SPELLFAMILYFLAG_DK_DEATH_COIL = 0x00002000, SPELLFAMILYFLAG1_DK_HUNGERING_COLD = 0x00001000, - // TODO: Figure out a more accurate name for the following familyflag(s) SPELLFAMILYFLAG_SHAMAN_TOTEM_EFFECTS = 0x04000000, // Seems to be linked to most totems and some totem effects }; - // Spell clasification enum SpellSpecific { @@ -902,7 +900,6 @@ enum SpellCustomAttributes SPELL_ATTR0_CU_NEGATIVE = SPELL_ATTR0_CU_NEGATIVE_EFF0 | SPELL_ATTR0_CU_NEGATIVE_EFF1 | SPELL_ATTR0_CU_NEGATIVE_EFF2, }; - typedef std::vector<uint32> SpellCustomAttribute; typedef std::vector<bool> EnchantCustomAttribute; diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp index ba00de8a956..79600b482df 100755 --- a/src/server/game/Weather/WeatherMgr.cpp +++ b/src/server/game/Weather/WeatherMgr.cpp @@ -89,7 +89,6 @@ void WeatherMgr::LoadWeatherData() return; } - do { Field *fields = result->Fetch(); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index 9b356d4b063..a249c31df28 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -162,7 +162,6 @@ class mob_av_marshal_or_warmaster : public CreatureScript uiEnrageTimer = urand(10*IN_MILLISECONDS,30*IN_MILLISECONDS); }else uiEnrageTimer -= diff; - // check if creature is not outside of building if (uiResetTimer <= diff) { diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index 18bd21a2b9c..3219b284c80 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -179,7 +179,6 @@ public: uiFrostboltTimer = urand(4*IN_MILLISECONDS,12*IN_MILLISECONDS); } else uiFrostboltTimer -= diff; - // check if creature is not outside of building if (uiResetTimer < diff) { diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index ee7ac38d27f..ad61e43bcd4 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -128,7 +128,6 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const { return new boss_drektharAI(creature); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index 5385eece8f1..74c0365c041 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -41,7 +41,6 @@ public: { boss_galvangarAI(Creature *c) : ScriptedAI(c) {} - uint32 uiCleaveTimer; uint32 uiFrighteningShoutTimer; uint32 uiWhirlwind1Timer; @@ -49,7 +48,6 @@ public: uint32 uiMortalStrikeTimer; uint32 uiResetTimer; - void Reset() { uiCleaveTimer = urand(1*IN_MILLISECONDS,9*IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index e734b53e85a..e46ed6c0593 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -368,7 +368,6 @@ public: }; - /*###### ## mob_phalanx ######*/ @@ -538,7 +537,6 @@ public: }; - /*###### ## npc_lokhtos_darkbargainer ######*/ @@ -606,7 +604,6 @@ public: }; - /*###### ## npc_dughal_stormwing ######*/ @@ -1204,8 +1201,6 @@ public: }; - - */ /*###### diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index 68dbd2d6ddb..ab6a09a11d0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -110,7 +110,6 @@ public: }; - void AddSC_boss_draganthaurissan() { new boss_emperor_dagran_thaurissan(); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp index 234511a45dd..02435e94473 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp @@ -95,7 +95,6 @@ public: }; - enum DoomrelSpells { SPELL_SHADOWBOLTVOLLEY = 15245, diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index eb72f272a97..509764f84f9 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -456,8 +456,7 @@ public: }; - - void AddSC_instance_blackrock_depths() +void AddSC_instance_blackrock_depths() { new instance_blackrock_depths(); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp index 2a857602455..ff74de7cdaf 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp @@ -202,7 +202,6 @@ public: }; - void AddSC_boss_gyth() { new boss_gyth(); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp index 7ea2dfdf058..5c631f4b626 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp @@ -123,7 +123,6 @@ public: }; - void AddSC_boss_razorgore() { new boss_razorgore(); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index 1c3b68afb43..b077ba1d82a 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -381,9 +381,6 @@ public: }; - - - void AddSC_boss_victor_nefarius() { new boss_victor_nefarius(); diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index 34a0e4524ef..1f86bf40786 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -543,9 +543,6 @@ public: }; - - - class boss_grubbis : public CreatureScript { public: @@ -592,7 +589,6 @@ public: }; - void AddSC_gnomeregan() { new npc_blastmaster_emi_shortfuse(); diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index b6d62379486..df1f5137f2b 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -137,7 +137,6 @@ public: }; - void AddSC_instance_gnomeregan() { new instance_gnomeregan(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index a2ac8fcd1cb..612626909ef 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -195,7 +195,6 @@ public: }; - void AddSC_boss_curator() { new boss_curator(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index 87e79099861..a550cff0df5 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -136,7 +136,6 @@ public: }; - void AddSC_boss_maiden_of_virtue() { new boss_maiden_of_virtue(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index ab5eeac5857..03721d01fb7 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -310,7 +310,6 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff) DoMeleeAttackIfReady(); } - void AddSC_boss_attumen() { new boss_attumen(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 85327e24e74..a836a4fdf12 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -335,7 +335,6 @@ public: }; - void AddSC_boss_netherspite() { new boss_netherspite(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index bab4f95b211..6f69aac9c55 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -415,7 +415,6 @@ public: }; - void AddSC_boss_nightbane() { new boss_nightbane(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 83e31d7bacb..4c354ad048a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -744,13 +744,6 @@ public: }; - - - - - - - /**************************************/ /**** Opera Red Riding Hood Event ****/ /************************************/ @@ -800,7 +793,6 @@ public: }; - class boss_bigbadwolf : public CreatureScript { public: @@ -927,7 +919,6 @@ public: }; - /**********************************************/ /******** Opera Romeo and Juliet Event *******/ /********************************************/ @@ -1513,7 +1504,6 @@ void boss_julianne::boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32 &dama sLog->outError("TSCR: boss_julianneAI: DamageTaken reach end of code, that should not happen."); } - void AddSC_bosses_opera() { new boss_dorothee(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 1a48ab455e3..28a336bf37d 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -310,7 +310,6 @@ public: }; - void AddSC_instance_karazhan() { new instance_karazhan(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index dc533233120..98d69488478 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -398,8 +398,6 @@ public: }; - - /*### # npc_berthold ####*/ @@ -441,7 +439,6 @@ public: }; - /*### # npc_image_of_medivh ####*/ @@ -649,7 +646,6 @@ public: }; - void AddSC_karazhan() { new npc_barnes(); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 465aee9d99c..7c1815dec4f 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -685,11 +685,6 @@ public: }; - - - - - void AddSC_boss_felblood_kaelthas() { new boss_felblood_kaelthas(); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 3d195df6eb1..5f9f850ceaf 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -332,7 +332,6 @@ public: }; - enum eHealingPotion { SPELL_HEALING_POTION = 15503 @@ -576,7 +575,6 @@ public: }; - enum eWarlockSpells { SPELL_IMMOLATE = 44267, diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index ef20f3444cc..65ac5aff16a 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -321,7 +321,6 @@ public: }; - class mob_fel_crystal : public CreatureScript { public: @@ -368,7 +367,6 @@ public: }; - void AddSC_boss_selin_fireheart() { new boss_selin_fireheart(); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index c4e3a93de6d..42c20299b38 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -194,7 +194,6 @@ public: }; - class mob_pure_energy : public CreatureScript { public: @@ -227,7 +226,6 @@ public: }; - void AddSC_boss_vexallus() { new boss_vexallus(); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index 3b281726eb5..ea7b2f1904f 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -202,7 +202,6 @@ public: }; - void AddSC_instance_magisters_terrace() { new instance_magisters_terrace(); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index 0fcc0a975a4..d6fed004baa 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -171,9 +171,6 @@ public: }; - - - void AddSC_magisters_terrace() { new npc_kalecgos(); diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp index 2d82d983c01..028362f2199 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp @@ -153,7 +153,6 @@ class mob_firesworn : public CreatureScript } }; - void AddSC_boss_garr() { new boss_garr(); diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index 2a10d078fbc..309a1546ca3 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -309,7 +309,6 @@ class boss_ragnaros : public CreatureScript } }; - class mob_son_of_flame : public CreatureScript { public: diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp index e4b6943ffdc..6b0631425d4 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp @@ -227,7 +227,6 @@ class instance_molten_core : public InstanceMapScript } }; - void AddSC_instance_molten_core() { new instance_molten_core(); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index b83ad7da024..4c0c9d06728 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -281,7 +281,6 @@ public: }; }; - class npc_unworthy_initiate_anchor : public CreatureScript { public: @@ -309,9 +308,6 @@ public: }; - - - class go_acherus_soul_prison : public GameObjectScript { public: @@ -516,9 +512,6 @@ public: }; - - - /*###### ## npc_dark_rider_of_acherus ######*/ @@ -605,7 +598,6 @@ public: }; - /*###### ## npc_salanar_the_horseman ######*/ @@ -681,7 +673,6 @@ public: }; - /*###### ## npc_ros_dark_rider ######*/ @@ -731,7 +722,6 @@ public: }; - // correct way: 52312 52314 52555 ... enum SG { @@ -780,7 +770,6 @@ public: }; - class npc_scarlet_ghoul : public CreatureScript { public: @@ -864,7 +853,6 @@ public: }; - /*#### ## npc_scarlet_miner_cart ####*/ @@ -921,7 +909,6 @@ public: }; - /*#### ## npc_scarlet_miner ####*/ @@ -1056,7 +1043,6 @@ public: }; - /*###### ## go_inconspicuous_mine_car ######*/ diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 64170b15cc1..fac16df491e 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -141,7 +141,6 @@ public: }; - /*###### ## npc_koltira_deathweaver ######*/ @@ -342,8 +341,6 @@ public: }; - - //Scarlet courier enum ScarletCourierEnum { @@ -432,7 +429,6 @@ public: }; - //Koltira & Valroth- Breakout enum valroth @@ -521,7 +517,6 @@ public: }; - /*###### ## npc_a_special_surprise ######*/ @@ -986,7 +981,6 @@ public: }; - void AddSC_the_scarlet_enclave_c2() { new npc_crusade_persuaded(); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 90305710a95..95550f70f4e 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -1663,8 +1663,6 @@ public: }; - - /*###### ## npc the lich king in dawn of light ######*/ @@ -1689,8 +1687,6 @@ public: }; - - void AddSC_the_scarlet_enclave_c5() { new npc_highlord_darion_mograine(); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp index 77fe08746cc..dff84c6f700 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp @@ -111,7 +111,6 @@ public: }; - void AddSC_the_scarlet_enclave() { new npc_valkyr_battle_maiden(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp index ab1a0dacd8f..53f6693a60d 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp @@ -96,7 +96,6 @@ public: }; - void AddSC_boss_azshir_the_sleepless() { new boss_azshir_the_sleepless(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index a791f5932eb..8fe766409e4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -122,7 +122,6 @@ public: }; - void AddSC_boss_bloodmage_thalnos() { new boss_bloodmage_thalnos(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 10a972af11b..902541b3223 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -743,8 +743,6 @@ public: }; - - class mob_pulsing_pumpkin : public CreatureScript { public: diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index 206c2547529..526a9210eb0 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -118,7 +118,6 @@ public: }; - class mob_scarlet_trainee : public CreatureScript { public: @@ -159,7 +158,6 @@ public: }; - void AddSC_boss_herod() { new boss_herod(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index 90c23f6f69b..565b183c7ea 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -131,7 +131,6 @@ public: }; - void AddSC_boss_high_inquisitor_fairbanks() { new boss_high_inquisitor_fairbanks(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index c450929d88a..2392927b488 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -75,7 +75,6 @@ public: }; - void AddSC_boss_houndmaster_loksey() { new boss_houndmaster_loksey(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index 6eb9da70cae..5bd2193f296 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -116,7 +116,6 @@ public: }; - void AddSC_boss_interrogator_vishas() { new boss_interrogator_vishas(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index be2ee619a65..33d2b16bf42 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -358,8 +358,6 @@ public: }; - - void AddSC_boss_mograine_and_whitemane() { new boss_scarlet_commander_mograine(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index 4d2909c3cd3..2b3dda13333 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -155,7 +155,6 @@ public: }; - void AddSC_instance_scarlet_monastery() { new instance_scarlet_monastery(); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp index 746e11d934e..3591431e0db 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp @@ -113,7 +113,6 @@ public: }; - void AddSC_boss_theolenkrastinov() { new boss_doctor_theolen_krastinov(); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index 6b74329d045..e01b0fb5664 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -201,8 +201,6 @@ public: }; - - void AddSC_boss_jandicebarov() { new boss_jandice_barov(); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp index 15f6e5c1e3a..0c81be88038 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp @@ -115,7 +115,6 @@ public: }; - void AddSC_boss_theravenian() { new boss_the_ravenian(); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp index 942ecdc0aff..3ae6a763afb 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp @@ -101,7 +101,6 @@ public: }; - void AddSC_boss_vectus() { new boss_vectus(); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index 2834f238294..d9dbf0558b7 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -144,7 +144,6 @@ public: }; - void AddSC_instance_scholomance() { new instance_scholomance(); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index b9b477ebd34..56ae509dac6 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -275,7 +275,6 @@ public: }; - void AddSC_instance_shadowfang_keep() { new instance_shadowfang_keep(); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 40c4f26a3f2..169e8d63a8f 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -141,9 +141,6 @@ public: }; - - - class npc_arugal_voidwalker : public CreatureScript { public: @@ -199,7 +196,6 @@ public: }; - void AddSC_shadowfang_keep() { new npc_shadowfang_prisoner(); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index d0466609019..9e4fc930e1c 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -188,7 +188,6 @@ public: }; - void AddSC_boss_baron_rivendare() { new boss_baron_rivendare(); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index 2e5ae72ad80..f15a27317d2 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -215,7 +215,6 @@ public: }; - void AddSC_boss_dathrohan_balnazzar() { new boss_dathrohan_balnazzar(); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 9d240ab74eb..f62c197aa41 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -472,7 +472,6 @@ class instance_stratholme : public InstanceMapScript } }; - void AddSC_instance_stratholme() { new instance_stratholme(); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 18b4adf27c8..4c9f5bc2a62 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -111,7 +111,6 @@ public: }; - /*###### ## mob_restless_soul ######*/ @@ -190,7 +189,6 @@ public: }; - /*###### ## mobs_spectral_ghostly_citizen ######*/ @@ -288,7 +286,6 @@ public: }; - void AddSC_stratholme() { new go_gauntlet_gate(); diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index 2e165b5aaf2..981694efb3e 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -203,7 +203,6 @@ public: }; - void AddSC_instance_sunken_temple() { new instance_sunken_temple(); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index f5e2660e20b..1c10ea81f8a 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -347,7 +347,6 @@ public: }; - void AddSC_boss_brutallus() { new boss_brutallus(); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index ad2080fa551..dcfa7e461ce 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -343,7 +343,6 @@ public: }; - class boss_alythess : public CreatureScript { public: @@ -674,7 +673,6 @@ public: }; - class mob_shadow_image : public CreatureScript { public: @@ -757,7 +755,6 @@ public: }; - void AddSC_boss_eredar_twins() { new boss_sacrolash(); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 15aafebe260..80a382d63f3 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -583,9 +583,6 @@ public: }; - - - void AddSC_boss_felmyst() { new boss_felmyst(); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 37c1b7ecfed..7d5bc8e9936 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -802,7 +802,6 @@ public: }; - void AddSC_boss_kalecgos() { new boss_kalecgos(); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index e332b983cf3..86327f34c29 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -493,7 +493,6 @@ public: }; - //AI for Kil'jaeden class boss_kiljaeden : public CreatureScript { @@ -680,7 +679,6 @@ public: } } - void UpdateAI(const uint32 diff) { if (!UpdateVictim() || Phase < PHASE_NORMAL) @@ -909,7 +907,6 @@ public: }; - //AI for Hand of the Deceiver class mob_hand_of_the_deceiver : public CreatureScript { @@ -1011,7 +1008,6 @@ public: }; - //AI for Felfire Portal class mob_felfire_portal : public CreatureScript { @@ -1057,7 +1053,6 @@ public: }; - //AI for Felfire Fiend class mob_volatile_felfire_fiend : public CreatureScript { @@ -1116,7 +1111,6 @@ public: }; - //AI for Armageddon target class mob_armageddon : public CreatureScript { @@ -1172,7 +1166,6 @@ public: }; - //AI for Shield Orbs class mob_shield_orb : public CreatureScript { @@ -1261,7 +1254,6 @@ public: }; - //AI for Sinister Reflection class mob_sinster_reflection : public CreatureScript { @@ -1432,7 +1424,6 @@ public: }; - void AddSC_boss_kiljaeden() { new go_orb_of_the_blue_flight(); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index face8af5ed4..6509a0317a6 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -201,7 +201,6 @@ public: }; - class boss_muru : public CreatureScript { public: @@ -367,7 +366,6 @@ public: }; - class npc_muru_portal : public CreatureScript { public: @@ -452,7 +450,6 @@ public: }; - class npc_dark_fiend : public CreatureScript { public: @@ -516,7 +513,6 @@ public: }; - class npc_void_sentinel : public CreatureScript { public: @@ -573,7 +569,6 @@ public: }; - class npc_blackhole : public CreatureScript { public: @@ -653,7 +648,6 @@ public: }; - void AddSC_boss_muru() { new boss_muru(); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index 9dc7be59349..7d36d4160e7 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -306,7 +306,6 @@ public: }; - void AddSC_instance_sunwell_plateau() { new instance_sunwell_plateau(); diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 4100f97b676..b24099c3d92 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -23,7 +23,6 @@ SDComment: Need some cosmetics updates when archeadas door are closing (Guardian SDCategory: Uldaman EndScriptData */ - #include "ScriptPCH.h" #include "uldaman.h" diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index f2d11cf11d4..29dbe1c56e5 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -101,8 +101,6 @@ class mob_jadespine_basilisk : public CreatureScript } }; - - /*###### ## go_keystone_chamber ######*/ diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 820e19eea9a..251ae131d01 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -439,7 +439,6 @@ class boss_janalai : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const { return new boss_janalaiAI(creature); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 4eb3c9ac07c..bab2c9cdc6c 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -445,7 +445,6 @@ class boss_nalorakk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const { return new boss_nalorakkAI(creature); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index f875c5c065f..9518d768f8f 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -587,7 +587,6 @@ class boss_zuljin : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const { return new boss_zuljinAI(creature); @@ -631,7 +630,6 @@ class mob_zuljin_vortex : public CreatureScript } }; - void AddSC_boss_zuljin() { new boss_zuljin(); diff --git a/src/server/scripts/EasternKingdoms/blasted_lands.cpp b/src/server/scripts/EasternKingdoms/blasted_lands.cpp index 792d49ff304..8cd3237360d 100644 --- a/src/server/scripts/EasternKingdoms/blasted_lands.cpp +++ b/src/server/scripts/EasternKingdoms/blasted_lands.cpp @@ -69,7 +69,6 @@ public: }; - /*###### ## npc_fallen_hero_of_horde ######*/ @@ -162,7 +161,6 @@ public: }; - void AddSC_blasted_lands() { new npc_deathly_usher(); diff --git a/src/server/scripts/EasternKingdoms/burning_steppes.cpp b/src/server/scripts/EasternKingdoms/burning_steppes.cpp index ec80a63dfaa..4d2abdea18c 100644 --- a/src/server/scripts/EasternKingdoms/burning_steppes.cpp +++ b/src/server/scripts/EasternKingdoms/burning_steppes.cpp @@ -150,9 +150,6 @@ public: }; - - - void AddSC_burning_steppes() { new npc_ragged_john(); diff --git a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp index d551be9cefb..4a41c325633 100644 --- a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp @@ -63,7 +63,6 @@ public: }; - /*###### ## npc_augustus_the_touched ######*/ @@ -95,7 +94,6 @@ public: }; - /*###### ## npc_darrowshire_spirit ######*/ @@ -136,7 +134,6 @@ public: }; - /*###### ## npc_tirion_fordring ######*/ @@ -191,7 +188,6 @@ public: }; - void AddSC_eastern_plaguelands() { new mobs_ghoul_flayer(); diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index 63d5268825a..13f69b90d1b 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -119,9 +119,6 @@ public: }; - - - /*###### ## Quest 9686 Second Trial ######*/ @@ -500,7 +497,6 @@ void npc_second_trial_paladin::npc_secondTrialAI::JustDied(Unit* Killer) } } - /*###### ## go_second_trial ######*/ @@ -520,7 +516,6 @@ public: }; - /*###### ## npc_apprentice_mirveda ######*/ @@ -605,7 +600,6 @@ public: }; - /*###### ## npc_infused_crystal ######*/ diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp index 9f357163af1..83faaf36dfe 100644 --- a/src/server/scripts/EasternKingdoms/ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp @@ -72,7 +72,6 @@ public: }; - /*###### ## npc_budd_nedreck ######*/ @@ -109,7 +108,6 @@ public: }; - /*###### ## npc_rathis_tomber ######*/ @@ -144,7 +142,6 @@ public: }; - /*###### ## npc_ranger_lilatha ######*/ @@ -256,7 +253,6 @@ public: }; - void AddSC_ghostlands() { new npc_blood_knight_dawnstar(); diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp index 363e7f68e87..f9925feda74 100644 --- a/src/server/scripts/EasternKingdoms/hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp @@ -149,8 +149,6 @@ public: }; - - /*###### ## npc_rinji ######*/ @@ -350,8 +348,6 @@ public: }; - - void AddSC_hinterlands() { new npc_00x09hl(); diff --git a/src/server/scripts/EasternKingdoms/ironforge.cpp b/src/server/scripts/EasternKingdoms/ironforge.cpp index 2b4f4fd034f..0c55076c3f2 100644 --- a/src/server/scripts/EasternKingdoms/ironforge.cpp +++ b/src/server/scripts/EasternKingdoms/ironforge.cpp @@ -91,7 +91,6 @@ public: }; - void AddSC_ironforge() { new npc_royal_historian_archesonus(); diff --git a/src/server/scripts/EasternKingdoms/loch_modan.cpp b/src/server/scripts/EasternKingdoms/loch_modan.cpp index fd1283d99a5..3ea335e83b8 100644 --- a/src/server/scripts/EasternKingdoms/loch_modan.cpp +++ b/src/server/scripts/EasternKingdoms/loch_modan.cpp @@ -98,7 +98,6 @@ public: }; - void AddSC_loch_modan() { new npc_mountaineer_pebblebitty(); diff --git a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp index f887f769412..71aaa4158c3 100644 --- a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp @@ -167,8 +167,6 @@ public: }; - - void AddSC_redridge_mountains() { new npc_corporal_keeshan(); diff --git a/src/server/scripts/EasternKingdoms/searing_gorge.cpp b/src/server/scripts/EasternKingdoms/searing_gorge.cpp index df09a543521..c4c9a7d0d07 100644 --- a/src/server/scripts/EasternKingdoms/searing_gorge.cpp +++ b/src/server/scripts/EasternKingdoms/searing_gorge.cpp @@ -80,7 +80,6 @@ public: }; - /*###### ## npc_lothos_riftwaker ######*/ @@ -119,7 +118,6 @@ public: }; - /*###### ## npc_zamael_lunthistle ######*/ @@ -169,7 +167,6 @@ public: }; - /*###### ## ######*/ diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp index afb8bb18c40..7a9d7efb347 100644 --- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp +++ b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp @@ -103,7 +103,6 @@ public: }; - void AddSC_silvermoon_city() { new npc_blood_knight_stillblade(); diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index c70c34aee6a..9ae10832e28 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -99,9 +99,6 @@ public: }; - - - /*###### ## npc_deathstalker_erland ######*/ @@ -197,7 +194,6 @@ public: }; - /*###### ## pyrewood_ambush #######*/ @@ -384,8 +380,6 @@ public: }; - - /*###### ## AddSC ######*/ diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp index 71c26f05942..76af8e4460e 100644 --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp @@ -75,7 +75,6 @@ public: }; - /*###### ## npc_bartleby ######*/ @@ -148,8 +147,6 @@ public: }; - - /*###### ## npc_dashel_stonefist ######*/ @@ -222,8 +219,6 @@ public: }; - - /*###### ## npc_lady_katrana_prestor ######*/ @@ -278,7 +273,6 @@ public: }; - /*###### ## npc_lord_gregor_lescovar ######*/ @@ -452,7 +446,6 @@ public: }; - /*###### ## npc_marzon_silent_blade ######*/ @@ -534,7 +527,6 @@ public: }; - /*###### ## npc_tyrion_spybot ######*/ @@ -684,7 +676,6 @@ public: }; - /*###### ## npc_tyrion ######*/ diff --git a/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp b/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp index 4a3838dd557..67f2bd2c7e8 100644 --- a/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp +++ b/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp @@ -16,7 +16,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ - #include "ScriptPCH.h" #include "ScriptedEscortAI.h" diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp index 57522ac8ca3..6b68ac58ea3 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp @@ -153,7 +153,6 @@ public: }; - /*###### ## go_mausoleum_door ## go_mausoleum_trigger diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp index 906827d91a4..4b0ac365181 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/undercity.cpp @@ -146,7 +146,6 @@ public: }; - /*###### ## npc_highborne_lamenter ######*/ @@ -256,7 +255,6 @@ public: }; - /*###### ## AddSC ######*/ diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index 10a54c4c81d..3ef6b7f689c 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -103,7 +103,6 @@ public: }; - /*###### ## npc_myranda_the_hag ######*/ @@ -153,7 +152,6 @@ public: }; - /*###### ## npc_the_scourge_cauldron ######*/ @@ -269,7 +267,6 @@ public: }; - /*###### ## npc_anchorite_truuen ######*/ @@ -401,8 +398,6 @@ public: }; - - /*###### ## ######*/ diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp index ef1a1ff49fb..5b6c377a37e 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/westfall.cpp @@ -188,8 +188,6 @@ public: }; - - /*###### ## npc_defias_traitor ######*/ @@ -263,8 +261,6 @@ public: }; - - void AddSC_westfall() { new npc_daphne_stilwell(); diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/wetlands.cpp index ca905dd30ae..b89aa63d166 100644 --- a/src/server/scripts/EasternKingdoms/wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/wetlands.cpp @@ -135,7 +135,6 @@ public: }; - /*###### ## npc_mikhail ######*/ diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 17bc89b5a3e..4833827755c 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -190,7 +190,6 @@ public: }; - enum eMorridune { SAY_MORRIDUNE_1 = -1048003, @@ -254,9 +253,6 @@ public: }; - - - void AddSC_blackfathom_deeps() { new go_blackfathom_altar(); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index cf8b2b1056e..3580b3d4c30 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp @@ -89,7 +89,6 @@ public: }; - void AddSC_boss_aku_mai() { 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 4e245921ead..9eec90ad02f 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp @@ -80,7 +80,6 @@ public: }; - void AddSC_boss_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 28461b19761..5833cb2d123 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -103,7 +103,6 @@ public: }; - void AddSC_boss_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 629c1b160a5..92c2f1d4d65 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -258,7 +258,6 @@ public: }; - void AddSC_instance_blackfathom_deeps() { 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 cd7d5ade018..3bd68634571 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -239,7 +239,6 @@ public: }; - #define SPELL_IMMOLATION 31303 #define SPELL_INFERNO_EFFECT 31302 @@ -325,7 +324,6 @@ public: }; - void AddSC_boss_anetheron() { new boss_anetheron(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 1ed391a263e..e2fa3a69f96 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -640,10 +640,6 @@ public: }; - - - - void AddSC_boss_archimonde() { new boss_archimonde(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 11b354f8a77..417d875da83 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -202,7 +202,6 @@ public: }; - #define SPELL_THRASH 12787 #define SPELL_CRIPPLE 31406 #define SPELL_WARSTOMP 31408 @@ -301,7 +300,6 @@ public: }; - void AddSC_boss_azgalor() { new boss_azgalor(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 9d478bc0639..377ca4c2e25 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -210,7 +210,6 @@ public: }; - void AddSC_boss_kazrogal() { new boss_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 26b0d9288a3..f46b374b2e8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -205,7 +205,6 @@ public: }; - void AddSC_boss_rage_winterchill() { 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 2f7abf76439..26aa3fd7cfc 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -121,8 +121,6 @@ public: }; - - class npc_thrall : public CreatureScript { public: @@ -201,8 +199,6 @@ public: }; - - class npc_tyrande_whisperwind : public CreatureScript { public: @@ -249,8 +245,6 @@ public: }; - - void AddSC_hyjal() { new npc_jaina_proudmoore(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index ca8945a8aaa..93450203aa0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -626,7 +626,6 @@ public: }; - #define SPELL_FRENZY 31540 class mob_ghoul : public CreatureScript @@ -733,7 +732,6 @@ public: }; - #define SPELL_RAISE_DEAD_1 31617 #define SPELL_RAISE_DEAD_2 31624 #define SPELL_RAISE_DEAD_3 31625 @@ -856,7 +854,6 @@ public: }; - #define SPELL_BANSHEE_CURSE 31651 #define SPELL_BANSHEE_WAIL 38183 #define SPELL_ANTI_MAGIC_SHELL 31662 @@ -964,7 +961,6 @@ public: }; - #define SPELL_WEB 28991 class mob_crypt_fiend : public CreatureScript @@ -1057,7 +1053,6 @@ public: }; - #define SPELL_MANA_BURN 31729 class mob_fel_stalker : public CreatureScript @@ -1150,7 +1145,6 @@ public: }; - #define SPELL_FROST_BREATH 31688 class mob_frost_wyrm : public CreatureScript @@ -1268,7 +1262,6 @@ public: }; - #define SPELL_GARGOYLE_STRIKE 31664 class mob_gargoyle : public CreatureScript @@ -1409,7 +1402,6 @@ public: }; - #define SPELL_EXPLODING_SHOT 7896 class alliance_rifleman : public CreatureScript diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index aad2308efc3..1ef40a375b1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -322,7 +322,6 @@ public: }; - void AddSC_instance_mount_hyjal() { new instance_hyjal(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 103e1b1b426..7981bdbed7e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -15,7 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ - /* Script Data Start SDName: Boss epoch SDAuthor: Tartalo @@ -151,7 +150,6 @@ public: }; - void AddSC_boss_epoch() { new boss_epoch(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp index 80d1002a44f..9f2723dcd60 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp @@ -31,7 +31,6 @@ enum Yells SAY_DEATH = -1595047 }; - class boss_infinite_corruptor : public CreatureScript { public: @@ -83,7 +82,6 @@ public: }; - void AddSC_boss_infinite_corruptor() { 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 002eaae451d..b269587b19d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -254,7 +254,6 @@ public: }; - void AddSC_boss_mal_ganis() { 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 2a92774fcfe..7ad2ba18ff5 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -135,7 +135,6 @@ public: }; - void AddSC_boss_meathook() { new boss_meathook(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index d05556fb904..6eb1cb66bd7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -162,7 +162,6 @@ public: }; - void AddSC_boss_salramm() { new boss_salramm(); 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 3c425063090..7777204567c 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 @@ -240,7 +240,6 @@ public: }; - void AddSC_instance_culling_of_stratholme() { new instance_culling_of_stratholme(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp index 2e86a227103..00faa87a378 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp @@ -143,7 +143,6 @@ public: }; - void AddSC_boss_aeonus() { new boss_aeonus(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp index c3c6dc9955d..3af197e8658 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp @@ -152,7 +152,6 @@ public: }; - void AddSC_boss_chrono_lord_deja() { new boss_chrono_lord_deja(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp index 94fa5c29e01..8c9a5c5c1b9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp @@ -150,7 +150,6 @@ public: }; - void AddSC_boss_temporus() { new boss_temporus(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp index d954b1688a2..adc2dc2be00 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp @@ -237,7 +237,6 @@ public: }; - struct Wave { uint32 PortalMob[4]; //spawns for portal waves (in order) @@ -360,7 +359,6 @@ public: }; - #define SAY_SAAT_WELCOME -1269019 #define GOSSIP_ITEM_OBTAIN "[PH] Obtain Chrono-Beacon" @@ -407,7 +405,6 @@ public: }; - void AddSC_dark_portal() { new npc_medivh_bm(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp index b5719776e2e..287abd42cf7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp @@ -347,7 +347,6 @@ public: }; - void AddSC_instance_dark_portal() { new instance_dark_portal(); 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 9384168729d..e402a48c59a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -150,7 +150,6 @@ public: }; - void AddSC_boss_captain_skarloc() { 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 408214822fc..4fa3fafebc5 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -136,7 +136,6 @@ public: }; - void AddSC_boss_epoch_hunter() { 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 dcea74d806c..0243441215b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -189,7 +189,6 @@ public: }; - void AddSC_boss_lieutenant_drake() { new go_barrel_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 1d4dd4ca5b2..5c7f49e23df 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -90,7 +90,6 @@ public: }; - /*###### ## npc_thrall_old_hillsbrad ######*/ @@ -563,9 +562,6 @@ public: }; - - - /*###### ## npc_taretha ######*/ @@ -658,8 +654,6 @@ public: }; - - /*###### ## AddSC ######*/ diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index 2c4eeee8df8..88348792569 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -253,7 +253,6 @@ public: }; - void AddSC_instance_onyxias_lair() { new instance_onyxias_lair(); 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 93502bda449..44e62de17b7 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -128,7 +128,6 @@ public: }; - void AddSC_boss_amnennar_the_coldbringer() { new boss_amnennar_the_coldbringer(); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index c650ccaeddd..90728b61ae5 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -157,7 +157,6 @@ public: break; } - if (Creature* creature = go->SummonCreature(uiCreature,2502.635f,844.140f,46.896f,0.633f)) { if (uiGongWaves == 10 || uiGongWaves == 1) @@ -210,7 +209,6 @@ public: }; - void AddSC_instance_razorfen_downs() { 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 69e2a482949..a49e12e99ca 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -84,7 +84,6 @@ public: }; - /*###### ## go_gong ######*/ @@ -168,7 +167,6 @@ public: }; - void AddSC_razorfen_downs() { new npc_henry_stern(); diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index 62879fb1e5d..ba2cdb765fa 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -103,7 +103,6 @@ public: }; - void AddSC_instance_razorfen_kraul() { 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 7cf4e62635b..f1b21dba2ab 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -146,7 +146,6 @@ public: }; - class npc_deaths_head_ward_keeper : public CreatureScript { public: @@ -193,8 +192,6 @@ public: }; - - void AddSC_razorfen_kraul() { new npc_willix(); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 2b5b7dc8ddc..bae7f4ec8f7 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -160,7 +160,6 @@ public: }; - void AddSC_boss_moam() { new boss_moam(); 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 cb0af2828d2..ecb9c0d28cb 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp @@ -212,7 +212,6 @@ public: }; - void AddSC_instance_ruins_of_ahnqiraj() { new instance_ruins_of_ahnqiraj(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 99c9f83f470..47c6a5e9c6d 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -348,9 +348,6 @@ public: }; - - - void AddSC_bug_trio() { new boss_kri(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 19801d13a1d..dfaf4c5187a 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -1323,12 +1323,6 @@ public: //GetAIs - - - - - - void AddSC_boss_cthun() { new boss_eye_of_cthun(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 252b38be4a5..1cb0a9631fb 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -204,7 +204,6 @@ public: }; - void AddSC_boss_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 6da31afdece..0ae028e99f6 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -146,7 +146,6 @@ public: }; - void AddSC_boss_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 3b27c17290e..510db661bf0 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -138,7 +138,6 @@ public: }; - void AddSC_boss_ouro() { new boss_ouro(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 76615c740d6..824c978e415 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -297,8 +297,6 @@ public: }; - - void AddSC_boss_sartura() { new boss_sartura(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 1c88c16c88a..f29b3b9f070 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -295,7 +295,6 @@ public: }; - void AddSC_boss_skeram() { new boss_skeram(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index d35c5bba887..ac6dddc5f82 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -595,8 +595,6 @@ public: }; - - void AddSC_boss_twinemperors() { new boss_veknilash(); 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 189f7dcf74e..3b8bfeec901 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -164,7 +164,6 @@ public: }; - void AddSC_instance_temple_of_ahnqiraj() { new instance_temple_of_ahnqiraj(); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index ed69570bf9d..77681853d44 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -141,7 +141,6 @@ public: }; - void AddSC_instance_wailing_caverns() { 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 cae9fef757d..8eb379024cb 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -393,9 +393,6 @@ public: }; - - - void AddSC_wailing_caverns() { new npc_disciple_of_naralex(); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index cc3a30965e9..eb0cd56c454 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -358,7 +358,6 @@ public: }; - void AddSC_instance_zulfarrak() { new instance_zulfarrak(); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 15eb847b926..554c3f94499 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -195,9 +195,6 @@ public: }; - - - /*###### +## go_troll_cage +######*/ @@ -396,8 +393,6 @@ public: }; - - /*###### ## go_shallow_grave ######*/ diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp index af47fe61a78..4915eb9625b 100644 --- a/src/server/scripts/Kalimdor/azshara.cpp +++ b/src/server/scripts/Kalimdor/azshara.cpp @@ -519,7 +519,6 @@ public: }; - void AddSC_azshara() { new mobs_spitelashes(); diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index 0f7fe9beef5..e40775e9bb9 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -285,9 +285,6 @@ public: }; - - - /*###### ## npc_injured_draenei ######*/ @@ -408,7 +405,6 @@ public: }; - /*###### ## npc_geezle ######*/ @@ -575,7 +571,6 @@ public: }; - enum eRavegerCage { NPC_DEATH_RAVAGER = 17556, diff --git a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp index 020d5e8395a..8da1167808d 100644 --- a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp @@ -149,7 +149,6 @@ public: }; - void AddSC_bloodmyst_isle() { new mob_webbed_creature(); diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp index 940580e8e38..f756445462c 100644 --- a/src/server/scripts/Kalimdor/darkshore.cpp +++ b/src/server/scripts/Kalimdor/darkshore.cpp @@ -177,8 +177,6 @@ public: }; - - /*#### # npc_prospector_remtravel ####*/ @@ -313,8 +311,6 @@ public: }; - - /*#### # npc_threshwackonator ####*/ @@ -352,7 +348,6 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_GYROMAST_REV) == QUEST_STATUS_INCOMPLETE) @@ -400,9 +395,6 @@ public: }; - - - void AddSC_darkshore() { new npc_kerlonian(); diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp index 069de947035..a956ceacee1 100644 --- a/src/server/scripts/Kalimdor/desolace.cpp +++ b/src/server/scripts/Kalimdor/desolace.cpp @@ -167,9 +167,6 @@ public: }; - - - /*###### ## go_iruxos. Quest 5381 ######*/ @@ -260,8 +257,6 @@ public: }; - - void AddSC_desolace() { new npc_aged_dying_ancient_kodo(); diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/durotar.cpp index 3a547490572..3f5c269fb07 100644 --- a/src/server/scripts/Kalimdor/durotar.cpp +++ b/src/server/scripts/Kalimdor/durotar.cpp @@ -99,7 +99,6 @@ public: }; - void AddSC_durotar() { new npc_lazy_peon(); diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index cf76044a01d..189054480a1 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -117,7 +117,6 @@ public: }; - /*###### ## npc_restless_apparition ######*/ @@ -386,7 +385,6 @@ public: }; - /*###### ## npc_nat_pagle ######*/ @@ -428,7 +426,6 @@ public: }; - /*###### ## npc_private_hendel ######*/ @@ -506,8 +503,6 @@ public: }; - - /*###### ## npc_zelfrax ######*/ @@ -634,7 +629,6 @@ public: { npc_stinkyAI(Creature* pCreature) : npc_escortAI(pCreature) { } - void WaypointReached(uint32 i) { Player* pPlayer = GetPlayerForEscort(); @@ -712,7 +706,6 @@ public: }; }; - void AddSC_dustwallow_marsh() { new mobs_risen_husk_spirit(); diff --git a/src/server/scripts/Kalimdor/felwood.cpp b/src/server/scripts/Kalimdor/felwood.cpp index cb07bcbfee3..197a830f0be 100644 --- a/src/server/scripts/Kalimdor/felwood.cpp +++ b/src/server/scripts/Kalimdor/felwood.cpp @@ -87,7 +87,6 @@ public: }; - void AddSC_felwood() { new npcs_riverbreeze_and_silversky(); diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp index cefb821856f..819b6ffe733 100644 --- a/src/server/scripts/Kalimdor/feralas.cpp +++ b/src/server/scripts/Kalimdor/feralas.cpp @@ -64,7 +64,6 @@ public: }; - /*###### ## npc_oox22fe ######*/ @@ -183,8 +182,6 @@ public: }; - - /*###### ## npc_screecher_spirit ######*/ diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp index 845a37388a8..583ce6e31dc 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/moonglade.cpp @@ -99,7 +99,6 @@ public: }; - /*###### ## npc_great_bear_spirit ######*/ @@ -158,7 +157,6 @@ public: }; - /*###### ## npc_silva_filnaveth ######*/ @@ -216,7 +214,6 @@ public: }; - /*###### ## npc_clintar_spirit ######*/ @@ -551,7 +548,6 @@ public: }; - /*#### # npc_clintar_dreamwalker ####*/ diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp index fa2a9fca81c..7ae0eb6cd8f 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/mulgore.cpp @@ -67,7 +67,6 @@ public: }; - /*##### # npc_kyle_frenzied ######*/ @@ -200,7 +199,6 @@ public: }; - /*##### # npc_plains_vision ######*/ @@ -315,7 +313,6 @@ public: }; - /*##### # ######*/ diff --git a/src/server/scripts/Kalimdor/orgrimmar.cpp b/src/server/scripts/Kalimdor/orgrimmar.cpp index c3333fd0c11..fb5a123f24d 100644 --- a/src/server/scripts/Kalimdor/orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/orgrimmar.cpp @@ -126,8 +126,6 @@ public: }; - - /*###### ## npc_thrall_warchief ######*/ @@ -243,8 +241,6 @@ public: }; - - void AddSC_orgrimmar() { new npc_shenthul(); diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index b810bc696b5..4f26073d50b 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -105,7 +105,6 @@ public: }; - /*### ## npcs_rutgar_and_frankal ###*/ @@ -221,7 +220,6 @@ public: }; - /*#### # quest_a_pawn_on_the_eternal_board (Defines) ####*/ diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp index 3924a98dd0e..fde36d3e590 100644 --- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp @@ -86,7 +86,6 @@ public: }; - /*###### ## npc_kaya_flathoof ######*/ @@ -167,7 +166,6 @@ public: }; - /*###### ## AddSC ######*/ diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index 4b0a5733506..68ee527bbce 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -235,7 +235,6 @@ public: }; - /*###### ## npc_marin_noggenfogger ######*/ @@ -269,7 +268,6 @@ public: }; - /*###### ## npc_steward_of_time ######*/ @@ -316,8 +314,6 @@ public: }; - - /*###### ## npc_stone_watcher_of_norgannon ######*/ @@ -382,7 +378,6 @@ public: }; - /*###### ## npc_OOX17 ######*/ @@ -482,8 +477,6 @@ public: }; - - /*#### # npc_tooga ####*/ @@ -649,8 +642,6 @@ public: }; - - void AddSC_tanaris() { new mob_aquementas(); diff --git a/src/server/scripts/Kalimdor/teldrassil.cpp b/src/server/scripts/Kalimdor/teldrassil.cpp index 3b0c6162ddd..a2186f4dee8 100644 --- a/src/server/scripts/Kalimdor/teldrassil.cpp +++ b/src/server/scripts/Kalimdor/teldrassil.cpp @@ -110,8 +110,6 @@ public: }; - - void AddSC_teldrassil() { new npc_mist(); diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 8d6300e890c..0698ae4f0d5 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -73,7 +73,6 @@ public: }; - /*###### # npc_gilthares ######*/ @@ -176,8 +175,6 @@ public: }; - - /*###### ## npc_sputtervalve ######*/ @@ -214,7 +211,6 @@ public: }; - /*###### ## npc_taskmaster_fizzule ######*/ @@ -316,7 +312,6 @@ public: }; - /*##### ## npc_twiggy_flathead #####*/ @@ -543,7 +538,6 @@ public: }; - /*##### ## npc_wizzlecrank_shredder #####*/ @@ -712,7 +706,6 @@ public: }; - void AddSC_the_barrens() { new npc_beaten_corpse(); diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index e161ed668ca..f27e8e75edd 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -106,8 +106,6 @@ public: }; - - /*###### # npc_lakota_windsong ######*/ @@ -202,8 +200,6 @@ public: }; - - /*###### # npc_paoka_swiftmountain ######*/ @@ -284,8 +280,6 @@ public: }; - - /*##### # npc_plucky ######*/ @@ -462,7 +456,6 @@ public: }; - void AddSC_thousand_needles() { new npc_kanati(); diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/thunder_bluff.cpp index c8563da9948..2c202e68754 100644 --- a/src/server/scripts/Kalimdor/thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/thunder_bluff.cpp @@ -135,8 +135,6 @@ public: }; - - void AddSC_thunder_bluff() { new npc_cairne_bloodhoof(); diff --git a/src/server/scripts/Kalimdor/winterspring.cpp b/src/server/scripts/Kalimdor/winterspring.cpp index 365c4a1ba87..fb245d5c97d 100644 --- a/src/server/scripts/Kalimdor/winterspring.cpp +++ b/src/server/scripts/Kalimdor/winterspring.cpp @@ -96,7 +96,6 @@ public: }; - /*###### ## npc_rivern_frostwind ######*/ @@ -130,7 +129,6 @@ public: }; - /*###### ## npc_witch_doctor_mauari ######*/ @@ -171,7 +169,6 @@ public: }; - void AddSC_winterspring() { new npc_lorax(); 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 <http://www.gnu.org/licenses/>. */ - /* 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); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index e413489600f..f29eae06ad8 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -125,7 +125,6 @@ public: }; - #define SAY_INTRO -1558000 #define SAY_SUMMON -1558001 @@ -305,7 +304,6 @@ public: }; - #define SPELL_AV_MORTAL_STRIKE 16856 #define SPELL_AV_SUNDER_ARMOR 16145 @@ -351,7 +349,6 @@ public: }; - void AddSC_boss_exarch_maladaar() { new boss_exarch_maladaar(); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 7bc09f74984..b893f22b328 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -160,7 +160,6 @@ public: }; - class mob_focus_fire : public CreatureScript { public: @@ -212,7 +211,6 @@ public: }; - void AddSC_boss_shirrak_the_dead_watcher() { new boss_shirrak_the_dead_watcher(); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 7d758d2bdf8..72f628c2988 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -215,7 +215,6 @@ public: }; - enum eEnums { SPELL_ARCANE_BOLT = 15254, @@ -308,7 +307,6 @@ public: }; - enum eEthereal { SPELL_ETHEREAL_APPRENTICE_FIREBOLT = 32369, @@ -361,7 +359,6 @@ public: }; - void AddSC_boss_nexusprince_shaffar() { new boss_nexusprince_shaffar(); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index a0e92e91704..2345ae4c41b 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -124,7 +124,6 @@ public: }; - void AddSC_boss_pandemonius() { new boss_pandemonius(); diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index fbb0bb5e14f..6daae1372fa 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -198,7 +198,6 @@ public: }; - /* ELEMENTALS */ class mob_syth_fire : public CreatureScript { @@ -308,7 +307,6 @@ public: }; }; - class mob_syth_frost : public CreatureScript { public: @@ -364,7 +362,6 @@ public: }; - class mob_syth_shadow : public CreatureScript { public: @@ -420,7 +417,6 @@ public: }; - void AddSC_boss_darkweaver_syth() { new boss_darkweaver_syth(); diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index af3630bac31..d19b756a5c7 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -211,7 +211,6 @@ public: }; - void AddSC_boss_talon_king_ikiss() { new boss_talon_king_ikiss(); diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 6280145aaa5..93a4abd8485 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -89,7 +89,6 @@ public: }; - void AddSC_instance_sethekk_halls() { new instance_sethekk_halls(); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index 1a479ce7658..de106876d15 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -204,7 +204,6 @@ public: }; - void AddSC_boss_ambassador_hellmaw() { new boss_ambassador_hellmaw(); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 042cf142c9b..c583349ca67 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -203,7 +203,6 @@ public: }; - void AddSC_boss_murmur() { new boss_murmur(); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index 03e32e48a94..f3f3fe7dabd 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -225,7 +225,6 @@ public: }; - void AddSC_instance_shadow_labyrinth() { new instance_shadow_labyrinth(); diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index 6840c732531..79367452638 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -66,7 +66,6 @@ public: }; - void AddSC_black_temple() { new npc_spirit_of_olum(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index d78a928ed93..b2a7ff4287f 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -330,7 +330,6 @@ public: }; - void AddSC_boss_gurtogg_bloodboil() { new boss_gurtogg_bloodboil(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 661b64ea9e3..c996a3ea35a 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -302,7 +302,6 @@ public: }; - void AddSC_boss_mother_shahraz() { new boss_mother_shahraz(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 6c75f3bd5ea..732f35c22a7 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -696,13 +696,6 @@ public: }; - - - - - - - void AddSC_boss_reliquary_of_souls() { new boss_reliquary_of_souls(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 6cd95ce2000..f7f31ca08c1 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -881,8 +881,6 @@ public: }; - - void AddSC_boss_shade_of_akama() { new boss_shade_of_akama(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index e344a83501b..5ff1a565f33 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -298,9 +298,6 @@ public: }; - - - void AddSC_boss_supremus() { new boss_supremus(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index e1dd52be551..7ccf85bc821 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -510,9 +510,6 @@ public: }; - - - void AddSC_boss_teron_gorefiend() { new mob_doom_blossom(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 06186d68860..299fa50adf4 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -226,7 +226,6 @@ public: }; - void AddSC_boss_najentus() { new boss_najentus(); diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index ea9f129e964..3aadb149de6 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -344,7 +344,6 @@ public: }; - void AddSC_instance_black_temple() { new instance_black_temple(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 60b167bf1a9..cf228240c27 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -349,7 +349,6 @@ public: }; - void AddSC_boss_morogrim_tidewalker() { new boss_morogrim_tidewalker(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index e217753c660..432eba5ae70 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -441,7 +441,6 @@ class instance_serpent_shrine : public InstanceMapScript } }; - void AddSC_instance_serpentshrine_cavern() { new instance_serpent_shrine(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 2bfa1fdb791..f57d8cb25e9 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -185,7 +185,6 @@ public: }; - #define SPELL_DISPEL_MAGIC 17201 #define SPELL_REPAIR 31532 #define H_SPELL_REPAIR 37936 @@ -264,7 +263,6 @@ public: }; - void AddSC_boss_mekgineer_steamrigger() { new boss_mekgineer_steamrigger(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index a9e0d953418..e4102fe6b11 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -203,8 +203,6 @@ public: }; - - void AddSC_boss_warlord_kalithresh() { new mob_naga_distiller(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 7c98e73745e..5d27df6b306 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -230,7 +230,6 @@ public: }; - void AddSC_instance_steam_vault() { new go_main_chambers_access_panel(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index 3825dba0dae..92be08c2dae 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -182,7 +182,6 @@ public: }; - void AddSC_boss_the_black_stalker() { new boss_the_black_stalker(); diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index f0e580cfc0e..01b7546506f 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -253,7 +253,6 @@ public: }; - void AddSC_boss_gruul() { new boss_gruul(); diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index 2fd902504be..7ede42708ae 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -191,7 +191,6 @@ public: }; - void AddSC_instance_gruuls_lair() { new instance_gruuls_lair(); diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 5f2fb7b7741..93049694318 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -257,7 +257,6 @@ class instance_magtheridons_lair : public InstanceMapScript } }; - void AddSC_instance_magtheridons_lair() { new instance_magtheridons_lair(); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 7271dff7a41..332cd1792b1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -307,7 +307,6 @@ class boss_grand_warlock_nethekurse : public CreatureScript } }; - class mob_fel_orc_convert : public CreatureScript { public: diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 6068414d29e..60b92956a34 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -267,7 +267,6 @@ struct advisorbase_ai : public ScriptedAI } }; - class boss_kaelthas : public CreatureScript { public: @@ -1517,7 +1516,6 @@ class mob_phoenix_tk : public CreatureScript } }; - //Phoenix Egg AI class mob_phoenix_egg_tk : public CreatureScript { @@ -1579,7 +1577,6 @@ class mob_phoenix_egg_tk : public CreatureScript } }; - void AddSC_boss_kaelthas() { new boss_kaelthas(); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index 9524b911125..ba6318a4686 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -114,7 +114,6 @@ class boss_nethermancer_sepethrea : public CreatureScript if (!UpdateVictim()) return; - //Frost Attack if (frost_attack_Timer <= diff) { diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index c963c1109c3..befa6ed5251 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -86,7 +86,6 @@ class instance_mechanar : public InstanceMapScript } }; - void AddSC_instance_mechanar() { new instance_mechanar; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 45a84daaa7d..02c8c6bb4e5 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -57,7 +57,6 @@ enum eSpells SPELL_33_ILLUSION = 36932, //entry 21467 }; - class boss_harbinger_skyriss : public CreatureScript { public: @@ -278,7 +277,6 @@ class boss_harbinger_skyriss : public CreatureScript } }; - #define SPELL_MIND_REND_IMAGE 36929 #define H_SPELL_MIND_REND_IMAGE 39021 @@ -305,7 +303,6 @@ class boss_harbinger_skyriss_illusion : public CreatureScript } }; - void AddSC_boss_harbinger_skyriss() { new boss_harbinger_skyriss(); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index f981102aa51..4eab5823fa5 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -43,7 +43,6 @@ enum eUnits MELLICHAR = 20904,//skyriss will kill this unit }; - /* Arcatraz encounters: 1 - Zereketh the Unbound event 2 - Dalliah the Doomsayer event @@ -99,7 +98,6 @@ class instance_arcatraz : public InstanceMapScript return false; } - void OnGameObjectCreate(GameObject* go) { switch(go->GetEntry()) diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp index be4904a6fa6..aa5a432742a 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/blades_edge_mountains.cpp @@ -255,7 +255,6 @@ public: }; - /*###### ## npc_daranelle ######*/ @@ -302,7 +301,6 @@ public: }; - /*###### ## npc_overseer_nuaar ######*/ @@ -337,7 +335,6 @@ public: }; - /*###### ## npc_saikkal_the_elder ######*/ @@ -379,7 +376,6 @@ public: }; - /*###### ## go_legion_obelisk ######*/ @@ -429,12 +425,10 @@ public: }; - /*###### ## npc_bloodmaul_brutebane ######*/ - enum eBloodmaul { NPC_OGRE_BRUTE = 19995, @@ -475,7 +469,6 @@ public: }; - /*###### ## npc_ogre_brute ######*/ @@ -538,7 +531,6 @@ public: }; - /*###### ## AddSC ######*/ diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index 8b840c39785..a841dacf9b5 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -172,7 +172,6 @@ public: }; - void AddSC_boss_doomlordkazzak() { new boss_doomlord_kazzak(); diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index 99d340f06a2..ba37b119623 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -176,7 +176,6 @@ public: }; - void AddSC_boss_doomwalker() { new boss_doomwalker(); diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp index 6647f597a96..414efdc7fb5 100644 --- a/src/server/scripts/Outland/hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/hellfire_peninsula.cpp @@ -127,7 +127,6 @@ public: }; - /*###### ## npc_ancestral_wolf ######*/ @@ -202,7 +201,6 @@ public: }; - /*###### ## go_haaleshi_altar ######*/ @@ -257,7 +255,6 @@ public: }; - /*###### ## npc_tracy_proudwell ######*/ @@ -314,7 +311,6 @@ public: }; - /*###### ## npc_trollbane ######*/ @@ -368,7 +364,6 @@ public: }; - /*###### ## npc_wounded_blood_elf ######*/ @@ -464,8 +459,6 @@ public: }; - - /*###### ## npc_fel_guard_hound ######*/ @@ -539,7 +532,6 @@ public: }; - void AddSC_hellfire_peninsula() { new npc_aeranas(); diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index 8ddb9177985..4a53c3d7d02 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -243,9 +243,6 @@ public: }; - - - /*#### # mob_sunspring_villager - should be done with ACID ####*/ @@ -384,8 +381,6 @@ public: }; - - /*###### ## npc_greatmother_geyah ######*/ @@ -497,7 +492,6 @@ public: }; - /*###### ## npc_lantresor_of_the_blade ######*/ @@ -575,7 +569,6 @@ public: }; - /*##### ## npc_maghar_captive #####*/ @@ -747,8 +740,6 @@ public: }; - - /*###### ## npc_creditmarker_visist_with_ancestors ######*/ @@ -794,7 +785,6 @@ public: }; - /*###### ## mob_sparrowhawk ######*/ @@ -904,7 +894,6 @@ public: }; - /*#### # ####*/ diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index 2b326088534..d9ffcf311d8 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -635,7 +635,6 @@ public: }; - class at_commander_dawnforge : public AreaTriggerScript { public: @@ -717,8 +716,6 @@ public: }; - - /*###### ## mob_phase_hunter ######*/ @@ -856,7 +853,6 @@ public: }; - /*###### ## npc_bessy ######*/ @@ -1052,7 +1048,6 @@ public: } }; - void AddSC_netherstorm() { new go_manaforge_control_console(); diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 6e9a0edc56f..8468bce657c 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -182,7 +182,6 @@ public: }; - /*### # mob_enslaved_netherwing_drake ####*/ @@ -325,7 +324,6 @@ public: }; - /*##### # mob_dragonmaw_peon #####*/ @@ -406,7 +404,6 @@ public: }; - /*###### ## npc_drake_dealer_hurlunk ######*/ @@ -437,7 +434,6 @@ public: }; - /*###### ## npc_flanis_swiftwing_and_kagrosh ######*/ @@ -490,7 +486,6 @@ public: }; - /*###### ## npc_murkblood_overseer ######*/ @@ -560,8 +555,6 @@ public: }; - - /*###### ## npc_oronok ######*/ @@ -638,7 +631,6 @@ public: }; - /*#### # npc_karynaku ####*/ @@ -890,8 +882,6 @@ public: }; - - /*#### # npc_earthmender_wilda ####*/ @@ -1070,8 +1060,6 @@ public: }; - - /*##### # Quest: Battle of the crimson watch #####*/ @@ -1691,9 +1679,6 @@ public: }; - - - /*#### # npc_enraged_spirits ####*/ diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp index d6e40737e9c..1437702fbb5 100644 --- a/src/server/scripts/Outland/shattrath_city.cpp +++ b/src/server/scripts/Outland/shattrath_city.cpp @@ -114,9 +114,6 @@ public: }; - - - /*###### # npc_salsalabim ######*/ @@ -193,7 +190,6 @@ public: }; - /* ################################################## Shattrath City Flask Vendors provides flasks to people exalted with 3 factions: @@ -254,7 +250,6 @@ public: }; - /*###### # npc_zephyr ######*/ @@ -287,7 +282,6 @@ public: }; - /*###### # npc_kservant ######*/ @@ -581,8 +575,6 @@ public: }; - - /*###### # npc_ishanah ######*/ @@ -621,7 +613,6 @@ public: }; - /*###### # npc_khadgar ######*/ @@ -690,7 +681,6 @@ public: }; - void AddSC_shattrath_city() { new npc_raliq_the_drunk(); diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp index c6da2b0e417..b9a4d2c48e3 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/terokkar_forest.cpp @@ -153,7 +153,6 @@ public: }; - /*###### ## mob_infested_root_walker ######*/ @@ -443,9 +442,6 @@ public: }; - - - /*###### ## npc_isla_starmane ######*/ @@ -539,7 +535,6 @@ public: }; - /*###### ## go_skull_pile ######*/ @@ -635,7 +630,6 @@ public: }; - /*######## ####npc_akuno #####*/ diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index e617c495f65..6cce8f0ea4e 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -251,7 +251,6 @@ public: } }; - class spell_rog_shiv : public SpellScriptLoader { public: diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index f5e9808a862..cd0d5b18581 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -254,7 +254,6 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const { return new npc_air_force_botsAI(creature); @@ -479,7 +478,6 @@ public: } }; - /*###### ## Triage quest ######*/ diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index 93b89023643..99b436dc348 100755 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -167,7 +167,6 @@ int Master::Run() ///- Initialize the World sWorld->SetInitialWorldSettings(); - // Initialise the signal handlers CoredSignalHandler SignalINT, SignalTERM; #ifdef _WIN32 @@ -182,7 +181,6 @@ int Master::Run() Handler.register_handler(SIGBREAK, &SignalBREAK); #endif /* _WIN32 */ - ///- Launch WorldRunnable thread ACE_Based::Thread world_thread(new WorldRunnable); world_thread.setPriority(ACE_Based::Highest); diff --git a/src/server/worldserver/TCSoap/TCSoap.cpp b/src/server/worldserver/TCSoap/TCSoap.cpp index c023e5c62a0..c0b3f8faebb 100755 --- a/src/server/worldserver/TCSoap/TCSoap.cpp +++ b/src/server/worldserver/TCSoap/TCSoap.cpp @@ -143,7 +143,6 @@ int ns1__executeCommand(soap* soap, char* command, char** result) return soap_sender_fault(soap, printBuffer, printBuffer); } - void SOAPCommand::commandFinished(void* soapconnection, bool success) { SOAPCommand* con = (SOAPCommand*)soapconnection; diff --git a/src/server/worldserver/TCSoap/TCSoap.h b/src/server/worldserver/TCSoap/TCSoap.h index e9aeeaefc01..d5232f33773 100755 --- a/src/server/worldserver/TCSoap/TCSoap.h +++ b/src/server/worldserver/TCSoap/TCSoap.h @@ -72,7 +72,6 @@ class SOAPWorkingThread : public ACE_Task<ACE_MT_SYNCH> void process_message(ACE_Message_Block *mb); }; - class SOAPCommand { public: |