diff options
36 files changed, 53 insertions, 53 deletions
diff --git a/src/server/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h index 06003c2b2f4..4a82fecbf9d 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.h +++ b/src/server/game/AI/CoreAI/GameObjectAI.h @@ -46,7 +46,7 @@ class TC_GAME_API GameObjectAI // Pass parameters between AI virtual void DoAction(int32 /*param = 0 */) { } - virtual void SetGUID(ObjectGuid /*guid*/, int32 /*id = 0 */) { } + virtual void SetGUID(ObjectGuid const& /*guid*/, int32 /*id = 0 */) { } virtual ObjectGuid GetGUID(int32 /*id = 0 */) const { return ObjectGuid::Empty; } static int32 Permissible(GameObject const* go); diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 84684b02c9d..91f8a820189 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -152,7 +152,7 @@ class TC_GAME_API UnitAI virtual void DoAction(int32 /*param*/) { } virtual uint32 GetData(uint32 /*id = 0*/) const { return 0; } virtual void SetData(uint32 /*id*/, uint32 /*value*/) { } - virtual void SetGUID(ObjectGuid /*guid*/, int32 /*id*/ = 0) { } + virtual void SetGUID(ObjectGuid const& /*guid*/, int32 /*id*/ = 0) { } virtual ObjectGuid GetGUID(int32 /*id*/ = 0) const { return ObjectGuid::Empty; } // Select the best target (in <targetType> order) from the threat list that fulfill the following: diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 7ec6926b802..6ee8f6faefb 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -709,7 +709,7 @@ void SmartAI::SetData(uint32 id, uint32 value) GetScript()->ProcessEventsFor(SMART_EVENT_DATA_SET, nullptr, id, value); } -void SmartAI::SetGUID(ObjectGuid /*guid*/, int32 /*id*/) { } +void SmartAI::SetGUID(ObjectGuid const& /*guid*/, int32 /*id*/) { } ObjectGuid SmartAI::GetGUID(int32 /*id*/) const { diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index acf22d94295..596625d7b4d 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -159,7 +159,7 @@ class TC_GAME_API SmartAI : public CreatureAI void SetData(uint32 id, uint32 value) override; // Used in scripts to share variables - void SetGUID(ObjectGuid guid, int32 id = 0) override; + void SetGUID(ObjectGuid const& guid, int32 id = 0) override; // Used in scripts to share variables ObjectGuid GetGUID(int32 id = 0) const override; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp index 73759c87843..fffc3981f5a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp @@ -282,9 +282,9 @@ struct npc_coren_direbrew_sisters : public ScriptedAI { npc_coren_direbrew_sisters(Creature* creature) : ScriptedAI(creature) { } - void SetGUID(ObjectGuid guid, int32 data) override + void SetGUID(ObjectGuid const& guid, int32 id) override { - if (data == DATA_TARGET_GUID) + if (id == DATA_TARGET_GUID) _targetGUID = guid; } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 282e1a56ecd..c967a4804d6 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -207,9 +207,9 @@ public: BossAI::JustDied(killer); } - void SetGUID(ObjectGuid guid, int32 data) override + void SetGUID(ObjectGuid const& guid, int32 id) override { - if (data == NPC_MIDNIGHT) + if (id == NPC_MIDNIGHT) _midnightGUID = guid; } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index d4869fb0d10..2b3bb2e066b 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -308,7 +308,7 @@ public: ObjectGuid prisonerGUID; - void SetGUID(ObjectGuid guid, int32 /*id*/) override + void SetGUID(ObjectGuid const& guid, int32 /*id*/) override { if (!prisonerGUID) prisonerGUID = guid; @@ -1166,7 +1166,7 @@ class npc_scarlet_miner : public CreatureScript } } - void SetGUID(ObjectGuid guid, int32 /*id = 0*/) override + void SetGUID(ObjectGuid const& guid, int32 /*id*/) override { InitWaypoint(); Start(false, false, guid); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index b292851b8db..bf70c9d7da7 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -224,7 +224,7 @@ class boss_mandokir : public CreatureScript return 0; } - void SetGUID(ObjectGuid guid, int32 /*type = 0 */) override + void SetGUID(ObjectGuid const& guid, int32 /*type = 0 */) override { _reviveGUID = guid; } @@ -380,7 +380,7 @@ class npc_chained_spirit : public CreatureScript _revivePlayerGUID.Clear(); } - void SetGUID(ObjectGuid guid, int32 /*type = 0 */) override + void SetGUID(ObjectGuid const& guid, int32 /*type = 0 */) override { _revivePlayerGUID = guid; } diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index 870f66a3dd4..3d025a6935f 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -131,9 +131,9 @@ public: _events.ScheduleEvent(EVENT_MULTI_SHOT, 10000); } - void SetGUID(ObjectGuid guid, int32 type) override + void SetGUID(ObjectGuid const& guid, int32 id) override { - if (type == GUID_EVENT_INVOKER) + if (id == GUID_EVENT_INVOKER) { Talk(EMOTE_LAMENT); DoPlaySoundToSet(me, SOUND_CREDIT); diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp index fd2ff426303..20b4e5160bc 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -219,7 +219,7 @@ struct boss_baleroc : public firelands_bossAI firelands_bossAI::UpdateAI(diff); } - void SetGUID(ObjectGuid guid, int32 type = 0) override + void SetGUID(ObjectGuid const& guid, int32 type = 0) override { switch (type) { diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 8540d89f634..5e1c30167e6 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -380,7 +380,7 @@ public: return ObjectGuid::Empty; } - void SetGUID(ObjectGuid guid, int32 type) override + void SetGUID(ObjectGuid const& guid, int32 type) override { switch (type) { diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index 27a9eae4216..87c641f4391 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -320,7 +320,7 @@ class npc_prince_taldaram_flame_sphere : public CreatureScript _events.ScheduleEvent(EVENT_DESPAWN, 13 * IN_MILLISECONDS); } - void SetGUID(ObjectGuid guid, int32 /*id = 0*/) override + void SetGUID(ObjectGuid const& guid, int32 /*id*/) override { _flameSphereTargetGUID = guid; } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 37aa313b662..f8a05dd4062 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -301,9 +301,9 @@ public: Talk(SAY_SLAY); } - void SetGUID(ObjectGuid guid, int32 type) override + void SetGUID(ObjectGuid const& guid, int32 id) override { - switch (type) + switch (id) { case GUID_TYPE_PET: { diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index a9b7551f43a..34c63c9b3e2 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -274,7 +274,7 @@ public: nerubian->DespawnOrUnsummon(); } - void SetGUID(ObjectGuid guid, int32 /*what*/) override + void SetGUID(ObjectGuid const& guid, int32 /*id*/) override { _anubar.push_back(guid); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index bc4c7d18087..68b0f93a226 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1147,7 +1147,7 @@ class npc_meteor_strike_flame : public CreatureScript SetCombatMovement(false); } - void SetGUID(ObjectGuid guid, int32 /*id = 0 */) override + void SetGUID(ObjectGuid const& guid, int32 /*id*/) override { _rootOwnerGuid = guid; _events.ScheduleEvent(EVENT_SPAWN_METEOR_FLAME, Milliseconds(800)); 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 fe3209ae24a..8e5f63ef364 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -447,7 +447,7 @@ struct npc_snobold_vassal : public ScriptedAI } } - void SetGUID(ObjectGuid guid, int32 id) override + void SetGUID(ObjectGuid const& guid, int32 id) override { if (id == DATA_NEW_TARGET) if (Unit* target = ObjectAccessor::GetPlayer(*me, guid)) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index b186f658d27..4c8f7f3168f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -338,9 +338,9 @@ class boss_rimefang : public CreatureScript _EnterEvadeMode(); } - void SetGUID(ObjectGuid guid, int32 type) override + void SetGUID(ObjectGuid const& guid, int32 id) override { - if (type == GUID_HOARFROST) + if (id == GUID_HOARFROST) { _hoarfrostTargetGUID = guid; _events.ScheduleEvent(EVENT_HOARFROST, 1000); diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 5368d77d975..07c79bc724c 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -139,9 +139,9 @@ class boss_gal_darah : public CreatureScript } } - void SetGUID(ObjectGuid guid, int32 type /*= 0*/) override + void SetGUID(ObjectGuid const& guid, int32 id) override { - if (type == DATA_SHARE_THE_LOVE) + if (id == DATA_SHARE_THE_LOVE) { if (Unit* target = ObjectAccessor::GetUnit(*me, guid)) Talk(EMOTE_IMPALE, target); diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index d351afc8869..cb63d60e40b 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -186,9 +186,9 @@ public: summons.Summon(summon); } - void SetGUID(ObjectGuid guid, int32 type) override + void SetGUID(ObjectGuid const& guid, int32 id) override { - if (type == DATA_SNAKES_WHYD_IT_HAVE_TO_BE_SNAKES) + if (id == DATA_SNAKES_WHYD_IT_HAVE_TO_BE_SNAKES) lWrappedPlayers.insert(guid); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 2d86dde9d82..b5ac810ea7f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -992,7 +992,7 @@ class npc_ball_of_flame : public CreatureScript } } - void SetGUID(ObjectGuid guid, int32 /*type*/) override + void SetGUID(ObjectGuid const& guid, int32 /*id*/) override { _chaseGUID = guid; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 16e606cc8ec..fe524c7015d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -285,9 +285,9 @@ class boss_blood_queen_lana_thel : public CreatureScript Talk(SAY_KILL); } - void SetGUID(ObjectGuid guid, int32 type = 0) override + void SetGUID(ObjectGuid const& guid, int32 id) override { - switch (type) + switch (id) { case GUID_VAMPIRE: _vampires.insert(guid); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index 6bfe4c555ed..c59798a5300 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -799,7 +799,7 @@ class npc_gunship : public CreatureScript } } - void SetGUID(ObjectGuid guid, int32 id/* = 0*/) override + void SetGUID(ObjectGuid const& guid, int32 id) override { if (id != ACTION_SHIP_VISITS) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index dffa7af0174..02d7197672e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -817,7 +817,7 @@ class npc_vengeful_shade : public CreatureScript }); } - void SetGUID(ObjectGuid guid, int32 /*type*/) override + void SetGUID(ObjectGuid const& guid, int32 /*id*/) override { _targetGUID = guid; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 80d826d9211..afba03fbd0a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -309,9 +309,9 @@ class boss_lord_marrowgar : public CreatureScript return ObjectGuid::Empty; } - void SetGUID(ObjectGuid guid, int32 type /*= 0 */) override + void SetGUID(ObjectGuid const& guid, int32 id) override { - switch (type) + switch (id) { case DATA_COLDFLAME_GUID: _coldflameTarget = guid; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 3bfa19fc752..b0f575f3b6d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -589,9 +589,9 @@ class npc_ice_tomb : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void SetGUID(ObjectGuid guid, int32 type/* = 0 */) override + void SetGUID(ObjectGuid const& guid, int32 id) override { - if (type == DATA_TRAPPED_PLAYER) + if (id == DATA_TRAPPED_PLAYER) { _trappedPlayerGUID = guid; _existenceCheckTimer = 1000; 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 d9ed312aae8..1cf92ceef37 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -1548,7 +1548,7 @@ class npc_valkyr_shadowguard : public CreatureScript } } - void SetGUID(ObjectGuid guid, int32 /* = 0*/) override + void SetGUID(ObjectGuid const& guid, int32 /*id*/) override { _grabbedPlayer = guid; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index df11ab7be69..67e7b2d1f2c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1016,9 +1016,9 @@ class npc_crok_scourgebane : public CreatureScript } } - void SetGUID(ObjectGuid guid, int32 type/* = 0*/) override + void SetGUID(ObjectGuid const& guid, int32 id) override { - if (type == ACTION_VRYKUL_DEATH) + if (id == ACTION_VRYKUL_DEATH) { _aliveTrash.erase(guid); if (_aliveTrash.empty()) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 81e9f59e578..ab626aeccd3 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -213,7 +213,7 @@ public: me->SetVisible(false); } - void SetGUID(ObjectGuid guid, int32 /*param*/) override + void SetGUID(ObjectGuid const& guid, int32 /*id*/) override { if (!guid) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 617c3ad17e6..fdf89f72ea3 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -440,9 +440,9 @@ struct npc_sapphiron_blizzard : public ScriptedAI return data == DATA_BLIZZARD_TARGET ? _targetGuid : ObjectGuid::Empty; } - void SetGUID(ObjectGuid guid, int32 data) override + void SetGUID(ObjectGuid const& guid, int32 id) override { - if (data == DATA_BLIZZARD_TARGET) + if (id == DATA_BLIZZARD_TARGET) _targetGuid = guid; } diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 47f3f394044..04a64982fde 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -434,9 +434,9 @@ public: return ObjectGuid::Empty; } - void SetGUID(ObjectGuid guid, int32 type) override + void SetGUID(ObjectGuid const& guid, int32 id) override { - switch (type) + switch (id) { case DATA_LAST_OVERLOAD_GUID: _arcaneOverloadGUID = guid; @@ -444,7 +444,7 @@ public: case DATA_FIRST_SURGE_TARGET_GUID: case DATA_FIRST_SURGE_TARGET_GUID + 1: case DATA_FIRST_SURGE_TARGET_GUID + 2: - _surgeTargetGUID[type - DATA_FIRST_SURGE_TARGET_GUID] = guid; + _surgeTargetGUID[id - DATA_FIRST_SURGE_TARGET_GUID] = guid; break; case DATA_LAST_TARGET_BARRAGE_GUID: _lastHitByArcaneBarrageGUID = guid; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index a3d881ec279..33e3b649c5f 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -144,7 +144,7 @@ class boss_keristrasza : public CreatureScript } } - void SetGUID(ObjectGuid guid, int32 id/* = 0 */) override + void SetGUID(ObjectGuid const& guid, int32 id) override { if (id == DATA_INTENSE_COLD) _intenseColdList.push_back(guid); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 35fe1efc788..a5464a4000a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -503,9 +503,9 @@ class boss_thorim : public CreatureScript _DespawnAtEvade(); } - void SetGUID(ObjectGuid guid, int32 type) override + void SetGUID(ObjectGuid const& guid, int32 id) override { - if (type == DATA_CHARGED_PILLAR) + if (id == DATA_CHARGED_PILLAR) { _activePillarGUID = guid; diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index cccc2841f85..0bc88c6ab5e 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -2429,7 +2429,7 @@ public: _playerGUID.Clear(); } - void SetGUID(ObjectGuid guid, int32 /*action*/) override + void SetGUID(ObjectGuid const& guid, int32 /*id*/) override { if (!_playerGUID.IsEmpty()) return; diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 3e1adaba562..4c8c9d7e541 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -1591,7 +1591,7 @@ struct npc_shadow_demon : public PassiveAI }); } - void SetGUID(ObjectGuid guid, int32 /*id*/) override + void SetGUID(ObjectGuid const& guid, int32 /*id*/) override { _targetGUID = guid; if (Unit* target = ObjectAccessor::GetUnit(*me, _targetGUID)) 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 3d03658c396..8888ed12707 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 @@ -106,7 +106,7 @@ public: Initialize(); } - void SetGUID(ObjectGuid guid, int32 id/* = 0 */) override + void SetGUID(ObjectGuid const& guid, int32 id) override { if (id == INNER_DEMON_VICTIM) victimGUID = guid; diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index a34b659f2d3..78791aa4faf 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -551,7 +551,7 @@ class npc_simon_bunny : public CreatureScript } // Used for getting involved player guid. Parameter id is used for defining if is a large(Monument) or small(Relic) node - void SetGUID(ObjectGuid guid, int32 id) override + void SetGUID(ObjectGuid const& guid, int32 id) override { me->SetCanFly(true); |