From 994121e671127ce11df4e631ab0a4c310234191f Mon Sep 17 00:00:00 2001 From: Treeston Date: Thu, 8 Mar 2018 18:41:46 +0100 Subject: Core/CreatureAI: CheckBoundary -> IsInBoundary, better reflects what it does. Also moved to public so spellscript can use it. (cherry picked from commit df639d85e4e82add71432ea0a4cba91f238a30ba) --- .../scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp | 2 +- src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp | 4 ++-- src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp | 2 +- src/server/scripts/Outland/BlackTemple/boss_illidan.cpp | 2 +- src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 5d2f11f3d39..1356b00a181 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -768,7 +768,7 @@ class npc_halion_controller : public CreatureScript Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) if (Player* player = i->GetSource()) - if (player->IsAlive() && CheckBoundary(player) && !player->IsGameMaster()) + if (player->IsAlive() && IsInBoundary(player) && !player->IsGameMaster()) return; EnterEvadeMode(EVADE_REASON_NO_HOSTILES); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 499dd15b966..66f2eae6fe0 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -1226,7 +1226,7 @@ class npc_thorim_arena_phase : public CreatureScript if (_isInArena && HeightPositionCheck(true)(who)) return false; - return CheckBoundary(who); + return IsInBoundary(who); } void Reset() override @@ -1319,7 +1319,7 @@ struct npc_thorim_minibossAI : public ScriptedAI bool CanAIAttack(Unit const* who) const final override { - return CheckBoundary(who); + return IsInBoundary(who); } void JustSummoned(Creature* summon) final override diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 522e796a4ae..7dc1c678e3d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -1077,7 +1077,7 @@ class instance_ulduar : public InstanceMapScript void AddDoor(GameObject* door, bool add) override { // Leviathan doors are South except the one it uses to enter the room - // which is North and should not be used for boundary checks in BossAI::CheckBoundary() + // which is North and should not be used for boundary checks in BossAI::IsInBoundary() if (door->GetEntry() == GO_LEVIATHAN_DOOR && door->GetPositionX() > 400.f) { if (add) diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 5bdbd406d67..b8891f61a93 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -685,7 +685,7 @@ struct boss_illidan_stormrage : public BossAI Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) if (Player* player = i->GetSource()) - if (player->IsAlive() && !player->IsGameMaster() && CheckBoundary(player)) + if (player->IsAlive() && !player->IsGameMaster() && IsInBoundary(player)) return; EnterEvadeMode(EVADE_REASON_NO_HOSTILES); diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 524e4db50ed..36d04389514 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -288,7 +288,7 @@ struct boss_shade_of_akama : public BossAI Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) if (Player* player = i->GetSource()) - if (player->IsAlive() && !player->IsGameMaster() && CheckBoundary(player)) + if (player->IsAlive() && !player->IsGameMaster() && IsInBoundary(player)) return; EnterEvadeMode(EVADE_REASON_NO_HOSTILES); -- cgit v1.2.3