diff options
| author | offl <11556157+offl@users.noreply.github.com> | 2021-09-15 01:04:03 +0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-15 23:03:26 +0100 |
| commit | c4906ce60be52c9a678287672a6461c3068beea3 (patch) | |
| tree | 6a34ae52e80e49aa3048c6b6684c4ae0fea508b3 /src/server/scripts/World | |
| parent | 6a5f3835f3588a1f1d6fa406f4b384869770b34a (diff) | |
Core/Misc: Rename UNIT_FLAG_NOT_SELECTABLE to UNIT_FLAG_UNINTERACTIBLE (#26913)
(cherry picked from commit c4741a131a0a28b69c228d3637beab7090e5f1e3)
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/boss_emerald_dragons.cpp | 6 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index d3d915bd10d..113346f6eae 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -95,7 +95,7 @@ struct emerald_dragonAI : public WorldBossAI void Reset() override { WorldBossAI::Reset(); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE)); + me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_NON_ATTACKABLE)); me->SetReactState(REACT_AGGRESSIVE); DoCast(me, SPELL_MARK_OF_NATURE_AURA, true); events.ScheduleEvent(EVENT_TAIL_SWEEP, 4s); @@ -633,7 +633,7 @@ class boss_taerar : public CreatureScript _shades += count; DoCast(SPELL_SHADE); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE)); + me->AddUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_NON_ATTACKABLE)); me->SetReactState(REACT_PASSIVE); ++_stage; @@ -670,7 +670,7 @@ class boss_taerar : public CreatureScript { _banished = false; - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE)); + me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_NON_ATTACKABLE)); me->RemoveAurasDueToSpell(SPELL_SHADE); me->SetReactState(REACT_AGGRESSIVE); } diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 37b7b382499..46e0bbdc20c 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -636,7 +636,7 @@ public: void Reset() override { Initialize(); - me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE); } void BeginEvent(Player* player) @@ -661,7 +661,7 @@ public: } Event = true; - me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); } void PatientDied(Position const* point) @@ -769,7 +769,7 @@ public: Initialize(); //no select - me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE); //no regen health me->AddUnitFlag(UNIT_FLAG_IN_COMBAT); @@ -809,8 +809,8 @@ public: if (Creature* doctor = ObjectAccessor::GetCreature(*me, DoctorGUID)) ENSURE_AI(npc_doctor::npc_doctorAI, doctor->AI())->PatientSaved(me, player, Coord); - //make not selectable - me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + //make uninteractible + me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); //regen health me->RemoveUnitFlag(UNIT_FLAG_IN_COMBAT); @@ -847,7 +847,7 @@ public: if (me->IsAlive() && me->GetHealth() <= 6) { me->RemoveUnitFlag(UNIT_FLAG_IN_COMBAT); - me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->setDeathState(JUST_DIED); me->AddDynamicFlag(UNIT_DYNFLAG_DEAD); |