diff options
| author | Spp <spp@jorge.gr> | 2012-11-20 09:29:52 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-20 09:29:52 +0100 |
| commit | 81606e5d1ea562b6842ff327fffb551aecd5a79c (patch) | |
| tree | e1935eff5e9b042a30f7bfdd495bc35d4cdcb804 | |
| parent | ced723a53a04b08cc7cafd4dda913108f138c31b (diff) | |
Core/Misc: Define some methods const
127 files changed, 273 insertions, 269 deletions
diff --git a/src/server/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h index 195f8d19c86..4561aa92741 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.h +++ b/src/server/game/AI/CoreAI/GameObjectAI.h @@ -42,7 +42,7 @@ class GameObjectAI // Pass parameters between AI virtual void DoAction(const int32 /*param = 0 */) {} virtual void SetGUID(uint64 /*guid*/, int32 /*id = 0 */) {} - virtual uint64 GetGUID(int32 /*id = 0 */) { return 0; } + virtual uint64 GetGUID(int32 /*id = 0 */) const { return 0; } static int Permissible(GameObject const* go); @@ -53,9 +53,9 @@ class GameObjectAI virtual bool QuestReward(Player* /*player*/, Quest const* /*quest*/, uint32 /*opt*/) { return false; } virtual uint32 GetDialogStatus(Player* /*player*/) { return 100; } virtual void Destroyed(Player* /*player*/, uint32 /*eventId*/) {} - virtual uint32 GetData(uint32 /*id*/) { return 0; } + virtual uint32 GetData(uint32 /*id*/) const { return 0; } virtual void SetData64(uint32 /*id*/, uint64 /*value*/) {} - virtual uint64 GetData64(uint32 /*id*/) { return 0; } + virtual uint64 GetData64(uint32 /*id*/) const { return 0; } virtual void SetData(uint32 /*id*/, uint32 /*value*/) {} virtual void OnGameEvent(bool /*start*/, uint16 /*eventId*/) {} virtual void OnStateChanged(uint32 /*state*/, Unit* /*unit*/) {} diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index b07c766ae0b..59604f395f9 100755 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -146,10 +146,10 @@ class UnitAI // Pass parameters between AI virtual void DoAction(int32 const /*param*/) {} - virtual uint32 GetData(uint32 /*id = 0*/) { return 0; } + virtual uint32 GetData(uint32 /*id = 0*/) const { return 0; } virtual void SetData(uint32 /*id*/, uint32 /*value*/) {} virtual void SetGUID(uint64 /*guid*/, int32 /*id*/ = 0) {} - virtual uint64 GetGUID(int32 /*id*/ = 0) { return 0; } + virtual uint64 GetGUID(int32 /*id*/ = 0) const { return 0; } Unit* SelectTarget(SelectAggroTarget targetType, uint32 position = 0, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); // Select the targets satifying the predicate. diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index f8025a32b7f..67cabc6ccb1 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -77,17 +77,13 @@ void SummonList::RemoveNotExisting() } } -bool SummonList::HasEntry(uint32 entry) +bool SummonList::HasEntry(uint32 entry) const { - for (iterator i = begin(); i != end();) + for (const_iterator i = begin(); i != end(); ++i) { Creature* summon = Unit::GetCreature(*me, *i); - if (!summon) - erase(i++); - else if (summon->GetEntry() == entry) + if (summon && summon->GetEntry() == entry) return true; - else - ++i; } return false; diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index aa46d555b7d..2a221d04404 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -54,7 +54,7 @@ class SummonList : public std::list<uint64> void DoZoneInCombat(uint32 entry = 0); void RemoveNotExisting(); - bool HasEntry(uint32 entry); + bool HasEntry(uint32 entry) const; private: Creature* me; }; diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 7dd4053b82f..6aebcbb2d8a 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -698,7 +698,7 @@ void SmartAI::DoAction(const int32 param) GetScript()->ProcessEventsFor(SMART_EVENT_ACTION_DONE, NULL, param); } -uint32 SmartAI::GetData(uint32 /*id*/) +uint32 SmartAI::GetData(uint32 /*id*/) const { return 0; } @@ -712,7 +712,7 @@ void SmartAI::SetGUID(uint64 /*guid*/, int32 /*id*/) { } -uint64 SmartAI::GetGUID(int32 /*id*/) +uint64 SmartAI::GetGUID(int32 /*id*/) const { return 0; } diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index f81d6e86850..ca6450aa746 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -151,7 +151,7 @@ class SmartAI : public CreatureAI void DoAction(const int32 param = 0); // Used in scripts to share variables - uint32 GetData(uint32 id = 0); + uint32 GetData(uint32 id = 0) const; // Used in scripts to share variables void SetData(uint32 id, uint32 value); @@ -160,7 +160,7 @@ class SmartAI : public CreatureAI void SetGUID(uint64 guid, int32 id = 0); // Used in scripts to share variables - uint64 GetGUID(int32 id = 0); + uint64 GetGUID(int32 id = 0) const; //core related static int Permissible(const Creature*); diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index b3f5c7bf704..7e3b3cc0f1a 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -587,12 +587,12 @@ bool Battlefield::AddOrSetPlayerToCorrectBfGroup(Player* player) //-------------------- //-Battlefield Method- //-------------------- -BfGraveyard* Battlefield::GetGraveyardById(uint32 id) +BfGraveyard* Battlefield::GetGraveyardById(uint32 id) const { if (id < m_GraveyardList.size()) { - if (m_GraveyardList[id]) - return m_GraveyardList[id]; + if (BfGraveyard* graveyard = m_GraveyardList.at(id)) + return graveyard; else sLog->outError(LOG_FILTER_BATTLEFIELD, "Battlefield::GetGraveyardById Id:%u not existed", id); } diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h index 77525b7d06e..4533c666869 100644 --- a/src/server/game/Battlefield/Battlefield.h +++ b/src/server/game/Battlefield/Battlefield.h @@ -147,7 +147,7 @@ class BfGraveyard // Method to changing who controls the graveyard void GiveControlTo(TeamId team); - TeamId GetControlTeamId() { return m_ControlTeam; } + TeamId GetControlTeamId() const { return m_ControlTeam; } // Find the nearest graveyard to a player float GetDistance(Player* player); @@ -187,7 +187,7 @@ class BfGraveyard bool HasPlayer(uint64 guid) { return m_ResurrectQueue.find(guid) != m_ResurrectQueue.end(); } // Get the graveyard's ID. - uint32 GetGraveyardId() { return m_GraveyardId; } + uint32 GetGraveyardId() const { return m_GraveyardId; } protected: TeamId m_ControlTeam; @@ -260,11 +260,11 @@ class Battlefield : public ZoneScript void HandlePlayerLeaveZone(Player* player, uint32 zone); // All-purpose data storage 64 bit - virtual uint64 GetData64(uint32 dataId) { return m_Data64[dataId]; } + virtual uint64 GetData64(uint32 dataId) const { return m_Data64[dataId]; } virtual void SetData64(uint32 dataId, uint64 value) { m_Data64[dataId] = value; } // All-purpose data storage 32 bit - virtual uint32 GetData(uint32 dataId) { return m_Data32[dataId]; } + virtual uint32 GetData(uint32 dataId) const { return m_Data32[dataId]; } virtual void SetData(uint32 dataId, uint32 value) { m_Data32[dataId] = value; } virtual void UpdateData(uint32 index, int32 pad) { m_Data32[index] += pad; } @@ -292,7 +292,7 @@ class Battlefield : public ZoneScript virtual void AddPlayerToResurrectQueue(uint64 npc_guid, uint64 player_guid); void RemovePlayerFromResurrectQueue(uint64 player_guid); void SetGraveyardNumber(uint32 number) { m_GraveyardList.resize(number); } - BfGraveyard* GetGraveyardById(uint32 id); + BfGraveyard* GetGraveyardById(uint32 id) const; // Misc methods Creature* SpawnCreature(uint32 entry, float x, float y, float z, float o, TeamId team); diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index 505bfb353f2..9d48bc6115f 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -454,7 +454,7 @@ void BattlefieldWG::OnStartGrouping() SendWarningToAllInZone(BATTLEFIELD_WG_TEXT_WILL_START); } -uint8 BattlefieldWG::GetSpiritGraveyardId(uint32 areaId) +uint8 BattlefieldWG::GetSpiritGraveyardId(uint32 areaId) const { switch (areaId) { @@ -802,7 +802,7 @@ void BattlefieldWG::OnPlayerEnterZone(Player* player) SendInitWorldStatesTo(player); } -uint32 BattlefieldWG::GetData(uint32 data) +uint32 BattlefieldWG::GetData(uint32 data) const { switch (data) { @@ -813,8 +813,8 @@ uint32 BattlefieldWG::GetData(uint32 data) case AREA_WESTPARK_WORKSHOP: case AREA_EASTPARK_WORKSHOP: // Graveyards and Workshops are controlled by the same team. - if (m_GraveyardList[GetSpiritGraveyardId(data)]) - return m_GraveyardList[GetSpiritGraveyardId(data)]->GetControlTeamId(); + if (BfGraveyard const* graveyard = GetGraveyardById(GetSpiritGraveyardId(data))) + return graveyard->GetControlTeamId(); } return Battlefield::GetData(data); diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h index 0a81a7af992..2aa38b6811a 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.h +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h @@ -410,9 +410,9 @@ class BattlefieldWG : public Battlefield bool FindAndRemoveVehicleFromList(Unit* vehicle); // returns the graveyardId in the specified area. - uint8 GetSpiritGraveyardId(uint32 areaId); + uint8 GetSpiritGraveyardId(uint32 areaId) const; - uint32 GetData(uint32 data); + uint32 GetData(uint32 data) const; protected: bool m_isRelicInteractible; diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index d2d9bdac4b3..45b6e452054 100755 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -1077,7 +1077,7 @@ bool Pet::HaveInDiet(ItemTemplate const* item) const return diet & FoodMask; } -uint32 Pet::GetCurrentFoodBenefitLevel(uint32 itemlevel) +uint32 Pet::GetCurrentFoodBenefitLevel(uint32 itemlevel) const { // -5 or greater food level if (getLevel() <= itemlevel + 5) //possible to feed level 60 pet with level 55 level food for full effect @@ -1881,7 +1881,7 @@ void Pet::ToggleAutocast(SpellInfo const* spellInfo, bool apply) } } -bool Pet::IsPermanentPetFor(Player* owner) +bool Pet::IsPermanentPetFor(Player* owner) const { switch (getPetType()) { diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h index 38a39827956..f24bb665710 100755 --- a/src/server/game/Entities/Pet/Pet.h +++ b/src/server/game/Entities/Pet/Pet.h @@ -112,9 +112,9 @@ class Pet : public Guardian bool isControlled() const { return getPetType() == SUMMON_PET || getPetType() == HUNTER_PET; } bool isTemporarySummoned() const { return m_duration > 0; } - bool IsPermanentPetFor(Player* owner); // pet have tab in character windows and set UNIT_FIELD_PETNUMBER + bool IsPermanentPetFor(Player* owner) const; // pet have tab in character windows and set UNIT_FIELD_PETNUMBER - bool Create (uint32 guidlow, Map* map, uint32 phaseMask, uint32 Entry, uint32 pet_number); + bool Create(uint32 guidlow, Map* map, uint32 phaseMask, uint32 Entry, uint32 pet_number); bool CreateBaseAtCreature(Creature* creature); bool CreateBaseAtCreatureInfo(CreatureTemplate const* cinfo, Unit* owner); bool CreateBaseAtTamed(CreatureTemplate const* cinfo, Map* map, uint32 phaseMask); @@ -142,9 +142,9 @@ class Pet : public Guardian void GivePetLevel(uint8 level); void SynchronizeLevelWithOwner(); bool HaveInDiet(ItemTemplate const* item) const; - uint32 GetCurrentFoodBenefitLevel(uint32 itemlevel); + uint32 GetCurrentFoodBenefitLevel(uint32 itemlevel) const; void SetDuration(int32 dur) { m_duration = dur; } - int32 GetDuration() { return m_duration; } + int32 GetDuration() const { return m_duration; } /* bool UpdateStats(Stats stat); diff --git a/src/server/game/Maps/ZoneScript.h b/src/server/game/Maps/ZoneScript.h index df6349a7664..7b20b0ee676 100755 --- a/src/server/game/Maps/ZoneScript.h +++ b/src/server/game/Maps/ZoneScript.h @@ -32,19 +32,20 @@ class ZoneScript virtual uint32 GetCreatureEntry(uint32 /*guidlow*/, CreatureData const* data) { return data->id; } virtual uint32 GetGameObjectEntry(uint32 /*guidlow*/, uint32 entry) { return entry; } - virtual void OnCreatureCreate(Creature* /*creature*/) {} - virtual void OnCreatureRemove(Creature* /*creature*/) {} - virtual void OnGameObjectCreate(GameObject* /*go*/) {} - virtual void OnGameObjectRemove(GameObject* /*go*/) {} + virtual void OnCreatureCreate(Creature *) { } + virtual void OnCreatureRemove(Creature *) { } - virtual void OnUnitDeath(Unit* /*unit*/) {} + virtual void OnGameObjectCreate(GameObject *) { } + virtual void OnGameObjectRemove(GameObject *) { } + + virtual void OnUnitDeath(Unit*) { } //All-purpose data storage 64 bit - virtual uint64 GetData64(uint32 /*DataId*/) { return 0; } + virtual uint64 GetData64(uint32 /*DataId*/) const { return 0; } virtual void SetData64(uint32 /*DataId*/, uint64 /*Value*/) {} //All-purpose data storage 32 bit - virtual uint32 GetData(uint32 /*DataId*/) { return 0; } + virtual uint32 GetData(uint32 /*DataId*/) const { return 0; } virtual void SetData(uint32 /*DataId*/, uint32 /*Value*/) {} virtual void ProcessEvent(WorldObject* /*obj*/, uint32 /*eventId*/) {} diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index 0d02e4495a5..2c2ae3a79c5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -273,7 +273,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -298,7 +298,7 @@ public: return 0; } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) const { switch (data) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp index fdb73fe1196..124743174b6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp @@ -222,7 +222,7 @@ public: } } - uint64 GetData64(uint32 type) + uint64 GetData64(uint32 type) const { switch (type) { diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index e97215a696d..8ee4ab0f594 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -214,7 +214,7 @@ class instance_deadmines : public InstanceMapScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -225,7 +225,7 @@ class instance_deadmines : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) const { switch (data) { diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index 2e520351150..8e126fae588 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -114,7 +114,7 @@ public: } } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) const { switch (uiType) { @@ -123,7 +123,7 @@ public: return 0; } - uint64 GetData64(uint32 uiType) + uint64 GetData64(uint32 uiType) const { switch (uiType) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 2ecd98cbc4c..2937d0ab700 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -241,7 +241,7 @@ public: return strSaveData; } - uint32 GetData(uint32 uiData) + uint32 GetData(uint32 uiData) const { switch (uiData) { @@ -264,7 +264,7 @@ public: return 0; } - uint64 GetData64(uint32 uiData) + uint64 GetData64(uint32 uiData) const { switch (uiData) { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 74d1b5b9f1b..7b79c18239e 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -75,6 +75,7 @@ public: uint32 size = instance->GetData(DATA_FEL_CRYSTAL_SIZE); for (uint8 i = 0; i < size; ++i) { + instance->SetData64(DATA_FEL_CRYSTAL, i); uint64 guid = instance->GetData64(DATA_FEL_CRYSTAL); sLog->outDebug(LOG_FILTER_TSCR, "Selin: Adding Fel Crystal " UI64FMTD " to list", guid); Crystals.push_back(guid); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index da15f9020da..c8bf50c0bcc 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -72,8 +72,7 @@ public: uint32 Encounter[MAX_ENCOUNTER]; uint32 DelrissaDeathCount; - std::list<uint64> FelCrystals; - std::list<uint64>::const_iterator CrystalItr; + std::vector<uint64> FelCrystals; uint64 SelinGUID; uint64 DelrissaGUID; @@ -85,8 +84,7 @@ public: uint64 KaelStatue[2]; uint64 EscapeOrbGUID; uint32 StatuesState; - - bool InitializedItr; + uint8 felCristalIndex; void Initialize() { @@ -107,8 +105,7 @@ public: KaelStatue[1] = 0; EscapeOrbGUID = 0; StatuesState = 0; - - InitializedItr = false; + felCristalIndex = 0; } bool IsEncounterInProgress() const @@ -119,7 +116,7 @@ public: return false; } - uint32 GetData(uint32 identifier) + uint32 GetData(uint32 identifier) const { switch (identifier) { @@ -276,7 +273,7 @@ public: OUT_LOAD_INST_DATA_COMPLETE; } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { @@ -297,26 +294,22 @@ public: case DATA_ESCAPE_ORB: return EscapeOrbGUID; case DATA_FEL_CRYSTAL: - { - if (FelCrystals.empty()) + if (FelCrystals.size() < felCristalIndex) { sLog->outError(LOG_FILTER_TSCR, "Magisters Terrace: No Fel Crystals loaded in Inst Data"); return 0; } - if (!InitializedItr) - { - CrystalItr = FelCrystals.begin(); - InitializedItr = true; - } - - uint64 guid = *CrystalItr; - ++CrystalItr; - return guid; - } + return FelCrystals.at(felCristalIndex); } return 0; } + + void SetData64(uint32 identifier, uint64 value) + { + if (identifier == DATA_FEL_CRYSTAL) + felCristalIndex = value; + } }; }; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp index 33719f8f1f6..1a055b9bce0 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp @@ -117,7 +117,7 @@ class instance_molten_core : public InstanceMapScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -128,7 +128,7 @@ class instance_molten_core : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) + uint64 GetData64(uint32 type) const { switch (type) { diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index a65edcd63bc..eb695e984cb 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -308,7 +308,7 @@ public: prisonerGUID = guid; } - uint64 GetGUID(int32 /*id*/) + uint64 GetGUID(int32 /*id*/) const { return prisonerGUID; } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index 3d3d9ae52ae..e65ab21b8cf 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -132,7 +132,7 @@ public: } } - uint64 GetData64(uint32 type) + uint64 GetData64(uint32 type) const { switch (type) { @@ -147,7 +147,7 @@ public: return 0; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == TYPE_MOGRAINE_AND_WHITE_EVENT) return encounter[0]; 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 197ee9a5bfe..5151268b70d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp @@ -67,7 +67,10 @@ public: instance->SetData(DATA_DOCTORTHEOLENKRASTINOV_DEATH, 0); if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS) + { + instance->SetData(TYPE_GANDLING, IN_PROGRESS); me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); + } } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index b6b5cc0acbd..e1cffbaf90d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -67,7 +67,10 @@ public: instance->SetData(DATA_LADYILLUCIABAROV_DEATH, 0); if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS) + { + instance->SetData(TYPE_GANDLING, IN_PROGRESS); me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); + } } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 406b1a6b10d..1768584cb25 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -74,7 +74,10 @@ public: instance->SetData(DATA_INSTRUCTORMALICIA_DEATH, 0); if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS) + { + instance->SetData(TYPE_GANDLING, IN_PROGRESS); me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); + } } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index 438c3c88bb4..3035688343c 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -63,7 +63,10 @@ public: instance->SetData(DATA_LORDALEXEIBAROV_DEATH, 0); if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS) + { + instance->SetData(TYPE_GANDLING, IN_PROGRESS); me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); + } } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp index 64bbbbe9514..dfab9dd37df 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp @@ -67,7 +67,10 @@ public: instance->SetData(DATA_LOREKEEPERPOLKELT_DEATH, 0); if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS) + { + instance->SetData(TYPE_GANDLING, IN_PROGRESS); me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); + } } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp index 381a039d609..b3d42d4676a 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp @@ -69,7 +69,10 @@ public: instance->SetData(DATA_THERAVENIAN_DEATH, 0); if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS) + { + instance->SetData(TYPE_GANDLING, IN_PROGRESS); me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); + } } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index c3b3724ec3d..f8a0c0010d2 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -128,21 +128,14 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { - if (type == TYPE_GANDLING) - { - if (IsBossDied[0] && IsBossDied[1] && IsBossDied[2] && IsBossDied[3] && IsBossDied[4] && IsBossDied[5]) - { - m_auiEncounter[0] = IN_PROGRESS; - return IN_PROGRESS; - } - } - - return 0; + return (type == TYPE_GANDLING && + IsBossDied[0] && IsBossDied[1] && IsBossDied[2] && + IsBossDied[3] && IsBossDied[4] && IsBossDied[5]) + ? IN_PROGRESS : 0; } }; - }; void AddSC_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 f219875b057..509fcdd845e 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -192,7 +192,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 17eedb87896..2e4ec7278fc 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -402,7 +402,7 @@ class instance_stratholme : public InstanceMapScript OUT_LOAD_INST_DATA_COMPLETE; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -426,7 +426,7 @@ class instance_stratholme : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) const { switch (data) { diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index e0987961f7e..624e5460213 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -193,7 +193,7 @@ public: State = data; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == EVENT_STATE) return State; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index bf31557d8a8..c4bb41036bc 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -122,7 +122,7 @@ public: return false; } - Player* GetPlayerInMap() + Player const * GetPlayerInMap() const { Map::PlayerList const& players = instance->GetPlayers(); @@ -182,7 +182,7 @@ public: } } - uint32 GetData(uint32 id) + uint32 GetData(uint32 id) const { switch (id) { @@ -196,7 +196,7 @@ public: return 0; } - uint64 GetData64(uint32 id) + uint64 GetData64(uint32 id) const { switch (id) { @@ -215,8 +215,8 @@ public: case DATA_ANVEENA: return Anveena; case DATA_KALECGOS_KJ: return KalecgosKJ; case DATA_PLAYER_GUID: - Player* Target = GetPlayerInMap(); - return Target->GetGUID(); + Player const* target = GetPlayerInMap(); + return target ? target->GetGUID() : 0; } return 0; } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index ee82da668f8..eeb1df7b693 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -466,20 +466,27 @@ class instance_uldaman : public InstanceMapScript } } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { - if (identifier == 0) return uiWhoWokeuiArchaedasGUID; - if (identifier == 1) return vVaultWalker[0]; // VaultWalker1 - if (identifier == 2) return vVaultWalker[1]; // VaultWalker2 - if (identifier == 3) return vVaultWalker[2]; // VaultWalker3 - if (identifier == 4) return vVaultWalker[3]; // VaultWalker4 - - if (identifier == 5) return vEarthenGuardian[0]; - if (identifier == 6) return vEarthenGuardian[1]; - if (identifier == 7) return vEarthenGuardian[2]; - if (identifier == 8) return vEarthenGuardian[3]; - if (identifier == 9) return vEarthenGuardian[4]; - if (identifier == 10) return vEarthenGuardian[5]; + switch (identifier) + { + case 0: + return uiWhoWokeuiArchaedasGUID; + case 1: + case 2: + case 3: + case 4: + return vVaultWalker.at(identifier); + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + return vEarthenGuardian.at(identifier - 5); + default: + break; + } return 0; } // end GetData64 diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index b113c7c68b9..c692e18e6ca 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -283,7 +283,7 @@ class instance_zulaman : public InstanceMapScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp index 104d479383b..8d17a18bb1b 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp @@ -113,7 +113,7 @@ class instance_zulgurub : public InstanceMapScript } } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) const { switch (uiType) { @@ -137,7 +137,7 @@ class instance_zulgurub : public InstanceMapScript return 0; } - uint64 GetData64(uint32 uiData) + uint64 GetData64(uint32 uiData) const { switch (uiData) { @@ -163,4 +163,4 @@ class instance_zulgurub : public InstanceMapScript void AddSC_instance_zulgurub() { new instance_zulgurub(); -}
\ No newline at end of file +} diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index 236c7b1ba69..8df5c5cdfd4 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -212,7 +212,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -233,7 +233,7 @@ public: return 0; } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) const { switch (data) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 6ab3e42dcb9..1fe3ac60260 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -157,7 +157,7 @@ public: } } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { @@ -294,7 +294,7 @@ public: } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { 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 9a5bc95853c..0ec7d1bdd25 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 @@ -196,7 +196,7 @@ class instance_culling_of_stratholme : public InstanceMapScript SaveToDB(); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -216,7 +216,7 @@ class instance_culling_of_stratholme : public InstanceMapScript return 0; } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { 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 926f48a17a2..879b0ed4aee 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp @@ -237,7 +237,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -253,7 +253,7 @@ public: return 0; } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) const { if (data == DATA_MEDIVH) return MedivhGUID; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 6995ca5add5..5f7af55358e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -203,7 +203,7 @@ public: } } - uint32 GetData(uint32 data) + uint32 GetData(uint32 data) const { switch (data) { @@ -223,7 +223,7 @@ public: return 0; } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) const { switch (data) { diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index 0689a8872bb..22ec68eba5e 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -189,7 +189,7 @@ public: } } - uint32 GetData(uint32 Type) + uint32 GetData(uint32 Type) const { switch (Type) { @@ -200,7 +200,7 @@ public: return 0; } - uint64 GetData64(uint32 Data) + uint64 GetData64(uint32 Data) const { switch (Data) { diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index a90d465c1ca..3acf9bc7029 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -186,7 +186,7 @@ public: } } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) const { switch (uiType) { @@ -197,7 +197,7 @@ public: return 0; } - uint64 GetData64(uint32 uiType) + uint64 GetData64(uint32 uiType) const { switch (uiType) { 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 1fa2f8bc713..d61d9416ac6 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp @@ -71,7 +71,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript return true; } - uint64 GetData64(uint32 type) + uint64 GetData64(uint32 type) const { switch (type) { 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 887ca4f3ad5..c8a1ff63925 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -90,7 +90,7 @@ public: return false; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -118,7 +118,7 @@ public: return 0; } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index 1bb5c1180bd..afd4d834f07 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -80,7 +80,7 @@ public: if (data == DONE)SaveToDB(); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -98,7 +98,7 @@ public: return 0; } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) const { if (data == DATA_NARALEX)return NaralexGUID; return 0; diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 4e1508d7cc9..2706b638573 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -180,7 +180,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -190,7 +190,7 @@ public: return 0; } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) const { switch (data) { diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index fe86f54ae15..9b48d7a9e1c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -116,7 +116,7 @@ class boss_elder_nadox : public CreatureScript GuardianDied = true; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_RESPECT_YOUR_ELDERS) return !GuardianDied ? 1 : 0; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index 02dcc04abd6..e6bb23b61d7 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -156,7 +156,7 @@ public: volunteerWork = false; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_VOLUNTEER_WORK) return volunteerWork ? 1 : 0; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp index f870c61dd5f..7eaf8368c21 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp @@ -160,7 +160,7 @@ public: } } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { @@ -252,7 +252,7 @@ public: SaveToDB(); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { 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 4e06ac0ba3a..10575ae288c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -105,7 +105,7 @@ public: } } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { @@ -149,7 +149,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index a9d6d9d91ba..e20b08c515e 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -404,7 +404,7 @@ public: me->AddLootMode(LOOT_MODE_HARD_MODE_1); // Add 1st Drake loot mode } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == TWILIGHT_ACHIEVEMENTS) return drakeCount; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp index 7d4438ed7c7..c39d7fbeb09 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -108,7 +108,7 @@ public: m_bVesperonKilled = true; } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) const { if (uiType == TYPE_SARTHARION_EVENT) return m_auiEncounter[0]; @@ -122,7 +122,7 @@ public: return 0; } - uint64 GetData64(uint32 uiData) + uint64 GetData64(uint32 uiData) const { switch (uiData) { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp index 3f710d7fedd..059f8c606a0 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -162,7 +162,7 @@ class instance_ruby_sanctum : public InstanceMapScript } } - uint64 GetData64(uint32 type) + uint64 GetData64(uint32 type) const { switch (type) { @@ -272,7 +272,7 @@ class instance_ruby_sanctum : public InstanceMapScript BaltharusSharedHealth = data; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type != DATA_BALTHARUS_SHARED_HEALTH) return 0; 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 412951b17d4..d2a01003324 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 @@ -235,7 +235,7 @@ public: SaveToDB(); } - uint32 GetData(uint32 uiData) + uint32 GetData(uint32 uiData) const { switch (uiData) { @@ -251,7 +251,7 @@ public: return 0; } - uint64 GetData64(uint32 uiData) + uint64 GetData64(uint32 uiData) const { switch (uiData) { 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 4d99429bcb8..0c081da5204 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -499,7 +499,7 @@ class mob_essence_of_twin : public CreatureScript { mob_essence_of_twinAI(Creature* creature) : ScriptedAI(creature) { } - uint32 GetData(uint32 data) + uint32 GetData(uint32 data) const { uint32 spellReturned = 0; switch (me->GetEntry()) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 7b0cd31bc67..917ad206b77 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -43,7 +43,6 @@ class instance_trial_of_the_crusader : public InstanceMapScript MistressOfPainCount = 0; TributeToImmortalityElegible = true; NeedSave = false; - EventNPCId = 0; TirionFordringGUID = 0; BarrentGUID = 0; @@ -470,7 +469,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript } } - uint64 GetData64(uint32 type) + uint64 GetData64(uint32 type) const { switch (type) { @@ -521,7 +520,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript return 0; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -575,7 +574,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript case 6000: case 6005: case 6010: - EventNPCId = NPC_TIRION; + return NPC_TIRION; break; case 5010: case 5030: @@ -584,7 +583,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript case 5060: case 5070: case 5080: - EventNPCId = NPC_LICH_KING_1; + return NPC_LICH_KING_1; break; case 120: case 122: @@ -593,7 +592,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript case 3051: case 3071: case 4020: - EventNPCId = NPC_VARIAN; + return NPC_VARIAN; break; case 130: case 132: @@ -602,7 +601,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript case 3070: case 3081: case 4030: - EventNPCId = NPC_GARROSH; + return NPC_GARROSH; break; case 1110: case 1120: @@ -614,13 +613,12 @@ class instance_trial_of_the_crusader : public InstanceMapScript case 1142: case 1144: case 1150: - EventNPCId = NPC_FIZZLEBANG; + return NPC_FIZZLEBANG; break; default: - EventNPCId = NPC_TIRION; + return NPC_TIRION; break; }; - return EventNPCId; default: break; } @@ -737,7 +735,6 @@ class instance_trial_of_the_crusader : public InstanceMapScript uint32 TrialCounter; uint32 EventStage; uint32 EventTimer; - uint32 EventNPCId; uint32 NorthrendBeasts; bool NeedSave; std::string SaveDataBuffer; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 8b39fc51766..759f8df7153 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -154,7 +154,7 @@ class boss_dred : public CreatureScript ++raptorsKilled; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_KING_DRED) return raptorsKilled; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 5d9acf4fca7..6ce56958d60 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -208,7 +208,7 @@ public: ohNovos = false; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_OH_NOVOS) return ohNovos ? 1 : 0; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 31b7787623c..d8c720b6f95 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -168,7 +168,7 @@ public: instance->SetData(DATA_TROLLGORE_EVENT, DONE); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_CONSUMPTION_JUNCTION) return consumptionJunction ? 1 : 0; diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index 99401c1d944..552798e96eb 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -129,7 +129,7 @@ public: } } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { @@ -174,7 +174,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 9bd0bfc8f6a..e0d3cc5dd4c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -246,7 +246,7 @@ class boss_devourer_of_souls : public CreatureScript threeFaced = false; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_THREE_FACED) return threeFaced; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp index 135976dde18..3afc248ab9d 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -73,7 +73,7 @@ class instance_forge_of_souls : public InstanceMapScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -86,7 +86,7 @@ class instance_forge_of_souls : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) + uint64 GetData64(uint32 type) const { switch (type) { 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 db2f2051f94..2e0c3364bbd 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 @@ -245,7 +245,7 @@ public: SaveToDB(); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -259,7 +259,7 @@ public: return 0; } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index a12bd96f6df..cdc21eb25ec 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -186,7 +186,7 @@ class boss_garfrost : public CreatureScript } } - uint32 GetData(uint32 /*type*/) + uint32 GetData(uint32 /*type*/) const { return _permafrostStack; } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index dcca892358d..df0829b3376 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -224,7 +224,7 @@ class instance_pit_of_saron : public InstanceMapScript return true; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -237,7 +237,7 @@ class instance_pit_of_saron : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) + uint64 GetData64(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index fd1aba79e83..446c26c9567 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -190,7 +190,7 @@ class boss_drakkari_colossus : public CreatureScript } } - uint32 GetData(uint32 data) + uint32 GetData(uint32 data) const { if (data == DATA_COLOSSUS_PHASE) return phase; diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 0d89c402054..595331d99d7 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -258,7 +258,7 @@ public: impaledList.push_back(guid); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_SHARE_THE_LOVE) return shareTheLove; diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index c1301dbd2d0..45c55f7ec9b 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -144,7 +144,7 @@ public: DoMeleeAttackIfReady(); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_LESS_RABI) return bPhase ? 0 : 1; diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index ae3447b9c68..2a89a73dbb2 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -318,7 +318,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -339,7 +339,7 @@ public: return 0; } - uint64 GetData64(uint32 type) + uint64 GetData64(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 70795b38b2a..9ee4bcea4d9 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -497,7 +497,7 @@ class boss_deathbringer_saurfang : public CreatureScript DoMeleeAttackIfReady(); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_MADE_A_MESS) if (_fallenChampionCastCount < RAID_MODE<uint32>(3, 5, 3, 5)) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 58856f9fb44..9c0f2139b1b 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -244,7 +244,7 @@ class boss_festergut : public CreatureScript _maxInoculatedStack = data; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_INOCULATED_STACK) return uint32(_maxInoculatedStack); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 31d57e2ca4e..263d70c6a50 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -247,7 +247,7 @@ class boss_lord_marrowgar : public CreatureScript return &_coldflameLastPos; } - uint64 GetGUID(int32 type/* = 0 */) + uint64 GetGUID(int32 type/* = 0 */) const { if (type == DATA_COLDFLAME_GUID) return _coldflameTarget; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 64f49c6e0e7..a950a74e59c 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -536,21 +536,15 @@ class boss_professor_putricide : public CreatureScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { case DATA_EXPERIMENT_STAGE: - { - // ALSO MODIFIES! - uint32 ret = uint32(_experimentState); - _experimentState ^= true; - return ret; - } + return _experimentState; case DATA_PHASE: return _phase; case DATA_ABOMINATION: - summons.RemoveNotExisting(); return uint32(summons.HasEntry(NPC_MUTATED_ABOMINATION_10) || summons.HasEntry(NPC_MUTATED_ABOMINATION_25)); default: break; @@ -1010,7 +1004,11 @@ class spell_putricide_unstable_experiment : public SpellScriptLoader if (GetCaster()->GetTypeId() != TYPEID_UNIT) return; - uint32 stage = GetCaster()->ToCreature()->AI()->GetData(DATA_EXPERIMENT_STAGE); + Creature* creature = GetCaster()->ToCreature(); + + uint32 stage = creature->AI()->GetData(DATA_EXPERIMENT_STAGE); + creature->AI()->SetData(DATA_EXPERIMENT_STAGE, !stage); + Creature* target = NULL; std::list<Creature*> creList; GetCreatureListWithEntryInGrid(creList, GetCaster(), NPC_ABOMINATION_WING_MAD_SCIENTIST_STALKER, 200.0f); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index e3c0f2260df..a12a38b2f62 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -290,7 +290,7 @@ class boss_sindragosa : public CreatureScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_MYSTIC_BUFFET_STACK) return _mysticBuffetStack; @@ -978,7 +978,7 @@ class npc_sindragosa_trash : public CreatureScript _isTaunted = data != 0; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_FROSTWYRM_OWNER) return _frostwyrmId; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index ba1a0614cdf..ec5172aeb83 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -636,7 +636,7 @@ class boss_the_lich_king : public CreatureScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 826c62a4390..cc40a076300 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -460,7 +460,7 @@ class boss_valithria_dreamwalker : public CreatureScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == MISSED_PORTALS) return _missedPortals; @@ -1019,7 +1019,7 @@ class npc_dream_portal : public CreatureScript me->DespawnOrUnsummon(); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { return (type == MISSED_PORTALS && _used) ? 0 : 1; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index dd0068f6327..3be76715f6c 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -590,7 +590,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -615,7 +615,7 @@ class instance_icecrown_citadel : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) + uint64 GetData64(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 636f2318712..3c6e4b50d24 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -117,7 +117,7 @@ class boss_faerlina : public CreatureScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_FRENZY_DISPELS) return _frenzyDispels; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 95839ef134f..e7126ba7e33 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -81,7 +81,7 @@ public: safetyDance = data ? true : false; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_SAFETY_DANCE) return safetyDance ? 1 : 0; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 71623cb1959..183d56a48c0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -85,7 +85,7 @@ class boss_loatheb : public CreatureScript _sporeLoserData = false; } - uint32 GetData(uint32 id) + uint32 GetData(uint32 id) const { if (id != DATA_ACHIEVEMENT_SPORE_LOSER) return 0; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 75b851a2b22..482f8a1200d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -215,7 +215,7 @@ public: polaritySwitch = data ? true : false; } - uint32 GetData(uint32 id) + uint32 GetData(uint32 id) const { if (id != DATA_POLARITY_SWITCH) return 0; diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index e806b60c848..b68d8d4a33c 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -316,7 +316,7 @@ public: } } - uint32 GetData(uint32 id) + uint32 GetData(uint32 id) const { switch (id) { @@ -329,7 +329,7 @@ public: return 0; } - uint64 GetData64(uint32 id) + uint64 GetData64(uint32 id) const { switch (id) { diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index ab9ed76cb1f..5e7104fd83a 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -251,7 +251,7 @@ public: instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - uint32 GetData(uint32 data) + uint32 GetData(uint32 data) const { if (data == DATA_SUMMON_DEATHS) return _summonDeaths; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index 6e85e701a27..4ca28943be3 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -226,7 +226,7 @@ public: } } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) const { switch (data) { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index af0ca6b3a3f..80a5336a30c 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -110,7 +110,7 @@ class boss_anomalus : public CreatureScript instance->SetData(DATA_ANOMALUS_EVENT, DONE); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_CHAOS_THEORY) return chaosTheory ? 1 : 0; 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 9602d1bc876..317a9845e87 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -155,7 +155,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_SPLIT_PERSONALITY) return splitPersonality; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index b17494800f1..11b1bce9ab7 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -214,7 +214,7 @@ public: _despawntimer = 2000; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { return type == DATA_COUNT ? _count : 0; } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index c571def96d7..f06800cd201 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -154,7 +154,7 @@ public: } } - uint32 GetData(uint32 identifier) + uint32 GetData(uint32 identifier) const { switch (identifier) { @@ -221,7 +221,7 @@ public: } } - uint64 GetData64(uint32 uiIdentifier) + uint64 GetData64(uint32 uiIdentifier) const { switch (uiIdentifier) { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index c691db4230c..4bbb4c1a5ed 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -117,7 +117,7 @@ public: _amberVoid = false; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 0543a317ffa..7035e0534aa 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -232,7 +232,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -244,7 +244,7 @@ public: return 0; } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { 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 93b246e9ddc..e399c5548e3 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 @@ -174,7 +174,7 @@ public: SaveToDB(); } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) const { switch (uiType) { @@ -190,7 +190,7 @@ public: return 0; } - uint64 GetData64(uint32 uiData) + uint64 GetData64(uint32 uiData) const { switch (uiData) { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 28052a57576..c3e815f57dd 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -236,7 +236,7 @@ public: ++abuseTheOoze; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_ABUSE_THE_OOZE) return abuseTheOoze; 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 3f5f2deb631..3c03508a14c 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -430,7 +430,7 @@ public: brannSparklinNews = false; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_BRANN_SPARKLIN_NEWS) return brannSparklinNews ? 1 : 0; 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 869cf46e74d..7a2b579dca9 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 @@ -186,7 +186,7 @@ public: SaveToDB(); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -199,7 +199,7 @@ public: return 0; } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index afd31331b7d..e52f1efcd73 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -378,7 +378,7 @@ class boss_algalon_the_observer : public CreatureScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { return type == DATA_HAS_FED_ON_TEARS ? _fedOnTears : 1; } @@ -728,7 +728,7 @@ class npc_living_constellation : public CreatureScript _isActive = false; } - uint32 GetData(uint32 /*type*/) + uint32 GetData(uint32 /*type*/) const { return _isActive ? 1 : 0; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index ec3125f7c0a..bfe158051b1 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -178,7 +178,7 @@ class boss_auriaya : public CreatureScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { 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 9d5adf39817..a26f5763472 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -349,7 +349,7 @@ class boss_flame_leviathan : public CreatureScript ++Shutdown; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index a3c9cb847e5..f60922c426c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -381,7 +381,7 @@ class boss_freya : public CreatureScript events.ScheduleEvent(EVENT_SUNBEAM, urand(5000, 15000)); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 845e694e842..1232c1b9051 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -235,7 +235,7 @@ class boss_general_vezax : public CreatureScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 540876f421b..c0fb4e3ecc8 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -154,7 +154,7 @@ class boss_ignis : public CreatureScript DoScriptText(SAY_DEATH, me); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_SHATTERED) return _shattered ? 1 : 0; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 2830e3ada04..5ea2678adfe 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -378,7 +378,7 @@ class boss_razorscale : public CreatureScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_QUICK_SHAVE) if (FlyCount <= 2) @@ -896,7 +896,7 @@ class npc_darkrune_guardian : public CreatureScript killedByBreath = false; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { return type == DATA_IRON_DWARF_MEDIUM_RARE ? killedByBreath : 0; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index afb60e60bf2..76aaf61f94d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -327,7 +327,7 @@ class boss_xt002 : public CreatureScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index cc8ff9996f3..f1bfddcbd87 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -655,7 +655,7 @@ class instance_ulduar : public InstanceMapScript { } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) const { switch (data) { @@ -741,7 +741,7 @@ class instance_ulduar : public InstanceMapScript return 0; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index e718942d091..9a50e1cbfa3 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -185,7 +185,7 @@ public: onTheRocks = value; } - uint32 GetData(uint32 data) + uint32 GetData(uint32 data) const { if (data == DATA_ON_THE_ROCKS) return onTheRocks; 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 919b0da5fc0..c236b36312d 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -166,7 +166,7 @@ public: } } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { @@ -247,7 +247,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index f2f03ff602b..fc82ad1b526 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -588,7 +588,7 @@ class npc_scourge_hulk : public CreatureScript killedByRitualStrike = false; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { return type == DATA_INCREDIBLE_HULK ? killedByRitualStrike : 0; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 39fd01a9269..3d0df453c0c 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -201,7 +201,7 @@ public: kingsBane = false; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_KINGS_BANE) return kingsBane ? 1 : 0; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp index c5d50d4e7fd..a76c5a61109 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp @@ -180,7 +180,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -192,7 +192,7 @@ public: return 0; } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp index d1209b40a19..de557e10e7f 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -62,7 +62,7 @@ class instance_archavon : public InstanceMapScript } } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index f6d918e0493..cea00417233 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -197,7 +197,7 @@ public: me->GetMotionMaster()->MoveChase(me->getVictim()); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_DEHYDRATION) return dehydration ? 1 : 0; diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index d1c65259738..408a7083383 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -158,7 +158,7 @@ public: voidDance = false; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_VOID_DANCE) return voidDance ? 1 : 0; diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index ed039728bb4..9f74cf0e5ca 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -418,7 +418,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -439,7 +439,7 @@ public: return 0; } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { 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 9facb42107b..9fa90be9765 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -179,7 +179,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -191,7 +191,7 @@ public: return false; } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { if (identifier == DATA_GRANDMASTERVORPIL) return m_uiGrandmasterVorpil; diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index a1e45fa4d15..8a2e25b176a 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -238,7 +238,7 @@ public: } } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { @@ -348,7 +348,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 0c6917b320f..1221e59b96e 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -104,7 +104,7 @@ public: victimGUID = guid; } - uint64 GetGUID(int32 id/* = 0 */) + uint64 GetGUID(int32 id/* = 0 */) const { if (id == INNER_DEMON_VICTIM) return victimGUID; 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 e1cd3e69887..f280ad77b42 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -243,7 +243,7 @@ class instance_serpent_shrine : public InstanceMapScript LeotherasEventStarter = data; } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { @@ -341,7 +341,7 @@ class instance_serpent_shrine : public InstanceMapScript SaveToDB(); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { 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 dd0b5ea9160..e8a096a83a1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -167,7 +167,7 @@ public: SaveToDB(); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -183,7 +183,7 @@ public: return 0; } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) const { switch (data) { diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index fa67659ca66..120e550bd4e 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -117,7 +117,7 @@ public: MaulgarEvent_Tank = data; } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { @@ -156,7 +156,7 @@ public: SaveToDB(); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index 233a8d82497..11e75f054ad 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -175,7 +175,7 @@ class instance_blood_furnace : public InstanceMapScript BroggokLeverGUID = go->GetGUID(); //Broggok lever } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) const { switch (data) { @@ -231,7 +231,7 @@ class instance_blood_furnace : public InstanceMapScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { 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 640e4439593..0bb949d3b90 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -123,7 +123,7 @@ class instance_magtheridons_lair : public InstanceMapScript } } - uint64 GetData64(uint32 type) + uint64 GetData64(uint32 type) const { switch (type) { @@ -211,7 +211,7 @@ class instance_magtheridons_lair : public InstanceMapScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { if (type == DATA_MAGTHERIDON_EVENT) return m_auiEncounter[0]; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index 4105a7d5821..c7c1cbba880 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -87,7 +87,7 @@ class instance_shattered_halls : public InstanceMapScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -99,7 +99,7 @@ class instance_shattered_halls : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) const { switch (data) { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index 1230b7e88cf..e9ee5a62bb8 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -113,7 +113,7 @@ class instance_the_eye : public InstanceMapScript } } - uint64 GetData64(uint32 identifier) + uint64 GetData64(uint32 identifier) const { switch (identifier) { @@ -151,7 +151,7 @@ class instance_the_eye : public InstanceMapScript SaveToDB(); } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index a96666705d1..37e314b6576 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -57,7 +57,7 @@ class instance_mechanar : public InstanceMapScript return false; } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -67,7 +67,7 @@ class instance_mechanar : public InstanceMapScript return false; } - uint64 GetData64(uint32 /*identifier*/) + uint64 GetData64(uint32 /*identifier*/) const { return 0; } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index d5b61b87fc2..e956ea0ed85 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -230,7 +230,7 @@ class instance_arcatraz : public InstanceMapScript } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { switch (type) { @@ -244,7 +244,7 @@ class instance_arcatraz : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) const { switch (data) { diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 4f0687ef11d..1d7154376a7 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -2284,7 +2284,7 @@ class npc_wormhole : public CreatureScript _showUnderground = urand(0, 100) == 0; // Guessed value, it is really rare though } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) const { return (type == DATA_SHOW_UNDERGROUND && _showUnderground) ? 1 : 0; } |