diff options
| author | Keader <keader.android@gmail.com> | 2017-12-27 18:17:13 -0300 | 
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-12-27 22:17:13 +0100 | 
| commit | 465b43fabef1727432ddda27f04b882b29fd2c7f (patch) | |
| tree | 80d3be5b5f457b1788e4de1f35bf15d2282848cd /src/server/scripts/Northrend | |
| parent | ea1387efde1d58cf13240481c931ad8e528c8d45 (diff) | |
Core/AI: Making guid const& in SetGUID method (#21128)
Diffstat (limited to 'src/server/scripts/Northrend')
22 files changed, 34 insertions, 34 deletions
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 8c7f36c3231..7d053a2302a 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 ebedf88f45a..12b5dbab71b 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 b10add03865..b123c7d048f 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 3957ad4793c..e8a83be810f 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1146,7 +1146,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 9594a607c86..0d91a38e852 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 187ab353803..6479765f204 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 90f1d4af510..53a866d843e 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 fb00acb39dc..33879e4e1bf 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 601aa75b335..7b06049fce8 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -994,7 +994,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 8ed22cce7be..5c83add5b8c 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 @@ -286,9 +286,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 8dd5d0e6624..0392e2244a8 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -805,7 +805,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 bf6920e741d..370ba1bffca 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -818,7 +818,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 7e7b372337e..98975fcbb98 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -310,9 +310,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 c64e42762d2..c6ecb4960a7 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 7b1de4c8bfe..bd123f5e194 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -1571,7 +1571,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 59a95ae0b9c..d59bce76df2 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 1a6bbccdb30..ca579f5ea4c 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 d0fb92fe0e1..58d180a928f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -441,9 +441,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 bd9b66a0f93..783053660e7 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -436,9 +436,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; @@ -446,7 +446,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 0de036eb782..ded86bbb457 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -151,7 +151,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 8dfe782bea0..bb7a7e9e68c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -506,9 +506,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 e4b1dc046f9..01b334413a9 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -2432,7 +2432,7 @@ public:              _playerGUID.Clear();          } -        void SetGUID(ObjectGuid guid, int32 /*action*/) override +        void SetGUID(ObjectGuid const& guid, int32 /*id*/) override          {              if (!_playerGUID.IsEmpty())                  return;  | 
