From f2ab43568a6995f34b83b2ec60588d9c69eb9255 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 1 Jan 2018 14:55:20 +0100 Subject: [PATCH] Core/AI: Making guid const& in SetGUID method --- src/server/game/AI/CoreAI/GameObjectAI.h | 2 +- src/server/game/AI/CoreAI/UnitAI.h | 2 +- src/server/game/AI/SmartScripts/SmartAI.cpp | 2 +- src/server/game/AI/SmartScripts/SmartAI.h | 2 +- .../BlackrockDepths/boss_coren_direbrew.cpp | 4 ++-- .../scripts/EasternKingdoms/Karazhan/boss_midnight.cpp | 4 ++-- .../scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp | 4 ++-- .../scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp | 4 ++-- src/server/scripts/EasternKingdoms/zone_undercity.cpp | 4 ++-- src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp | 4 ++-- .../Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp | 2 +- .../Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp | 4 ++-- .../Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp | 2 +- .../Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp | 2 +- .../TrialOfTheCrusader/boss_northrend_beasts.cpp | 2 +- .../FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp | 4 ++-- src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp | 4 ++-- src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp | 4 ++-- .../Northrend/IcecrownCitadel/boss_blood_prince_council.cpp | 2 +- .../IcecrownCitadel/boss_blood_queen_lana_thel.cpp | 4 ++-- .../IcecrownCitadel/boss_icecrown_gunship_battle.cpp | 2 +- .../Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp | 2 +- .../Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp | 4 ++-- .../scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp | 4 ++-- .../Northrend/IcecrownCitadel/boss_the_lich_king.cpp | 2 +- .../scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp | 4 ++-- src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp | 2 +- src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp | 4 ++-- .../scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp | 6 +++--- .../scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp | 2 +- src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp | 4 ++-- src/server/scripts/Northrend/zone_borean_tundra.cpp | 4 ++-- src/server/scripts/Outland/BlackTemple/boss_illidan.cpp | 2 +- .../SerpentShrine/boss_leotheras_the_blind.cpp | 2 +- src/server/scripts/Outland/zone_blades_edge_mountains.cpp | 2 +- 35 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/server/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h index f1c3b67232..02e0b03625 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.h +++ b/src/server/game/AI/CoreAI/GameObjectAI.h @@ -43,7 +43,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*/) { return PERMIT_BASE_NO; } diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 90bc84ad81..5038229538 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -165,7 +165,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; } Unit* SelectTarget(SelectAggroTarget targetType, uint32 position = 0, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 6627723515..1e3b6d6ebb 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -762,7 +762,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 332eeed7a4..e3a56591f2 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -154,7 +154,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 c4fc5cc816..4d8ec71c1b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp @@ -287,9 +287,9 @@ public: { npc_coren_direbrew_sistersAI(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 385db1282f..2735b5a1fd 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 9039054210..025a846394 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -305,7 +305,7 @@ public: ObjectGuid prisonerGUID; - void SetGUID(ObjectGuid guid, int32 /*id*/) override + void SetGUID(ObjectGuid const& guid, int32 /*id*/) override { if (!prisonerGUID) prisonerGUID = guid; @@ -1169,7 +1169,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 a92e6e2dc9..5fb077818f 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -213,7 +213,7 @@ class boss_mandokir : public CreatureScript return 0; } - void SetGUID(ObjectGuid guid, int32 /*type = 0 */) override + void SetGUID(ObjectGuid const& guid, int32 /*id = 0 **/) override { _reviveGUID = guid; } @@ -369,7 +369,7 @@ class npc_chained_spirit : public CreatureScript _revivePlayerGUID.Clear(); } - void SetGUID(ObjectGuid guid, int32 /*type = 0 */) override + void SetGUID(ObjectGuid const& guid, int32 /*id = 0 */) override { _revivePlayerGUID = guid; } diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index e67e6a7058..cfb6306d8a 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -137,9 +137,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 e0274a1482..7a4a95861b 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -285,9 +285,9 @@ class boss_baleroc : public CreatureScript DoBalerocAttackIfReady(); } - void SetGUID(ObjectGuid guid, int32 type = 0) override + void SetGUID(ObjectGuid const& guid, int32 id = 0) override { - switch (type) + switch (id) { case GUID_TORMENTED: { 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 1da0c87434..ef1da06e38 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -304,7 +304,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 729350062c..392323cb93 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -294,9 +294,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 9cafe255ad..94c2e0937b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -269,7 +269,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 a0b160c6b5..d5343684e7 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1141,7 +1141,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 839fb08bc6..f874899678 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -357,7 +357,7 @@ class npc_snobold_vassal : public CreatureScript } } - 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 c992a94cfc..1dcfcf6319 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -334,9 +334,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 8ae9dab8fb..1b035611f6 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -137,9 +137,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 75b3808d43..3e536be31c 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -184,9 +184,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 9d87ed9178..819bfd1111 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -985,7 +985,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 ce523fc652..e7ab6594be 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 @@ -281,9 +281,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 390eb984c5..13d14afb03 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 0d51f1631b..5e7bb60890 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -813,7 +813,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 582af40794..fec87cb5b3 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -305,9 +305,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 2fce5dc772..771fa44ed6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -582,9 +582,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 4e4b4f6674..785543e044 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -1547,7 +1547,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 e3c18dfe8e..8052de7142 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1015,9 +1015,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 ff94c8cdd6..cf460d5291 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -209,7 +209,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 a0fb628765..bb4661686d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -436,9 +436,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 a40e101df1..5f405a129c 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -430,9 +430,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; @@ -440,7 +440,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 63dce21639..67a0fc1af4 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -148,7 +148,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 b4258058f9..8d3ef8e72d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -500,9 +500,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 cf5eef834f..505b5662d1 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -2219,7 +2219,7 @@ public: uiEventPhase = 1; } - void SetGUID(ObjectGuid uiGuid, int32 /*iId*/ = 0) override + void SetGUID(ObjectGuid const& uiGuid, int32 /*iId*/ = 0) override { uiPlayerGUID = uiGuid; } @@ -2435,7 +2435,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 d7b5608700..00a5b4e86b 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -1633,7 +1633,7 @@ public: }); } - 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 e7d011a5b1..1ef2659dea 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 @@ -102,7 +102,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 1839c23953..17928930e8 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -555,7 +555,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);