From ed93a9706842ff5419279d4b2c473943e6ef2549 Mon Sep 17 00:00:00 2001 From: ModoX Date: Fri, 15 Jul 2022 22:34:06 +0200 Subject: Core/Units: Replace UNIT_DYNFLAG_DEAD with UNIT_FLAG3_FAKE_DEAD (#28117) --- .../Northrend/IcecrownCitadel/boss_blood_prince_council.cpp | 2 +- src/server/scripts/Northrend/zone_grizzly_hills.cpp | 2 +- src/server/scripts/Spells/spell_generic.cpp | 8 ++++---- src/server/scripts/Spells/spell_quest.cpp | 2 +- src/server/scripts/World/npcs_special.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/server/scripts') 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 afc5777638c..a4567be2607 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -556,7 +556,7 @@ struct BloodPrincesBossAI : public BossAI me->RemoveAurasDueToSpell(SPELL_FEIGN_DEATH); me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetImmuneToPC(false); - me->RemoveDynamicFlag(UNIT_DYNFLAG_DEAD); + me->RemoveUnitFlag3(UNIT_FLAG3_FAKE_DEAD); me->m_Events.AddEvent(new StandUpEvent(me), me->m_Events.CalculateTime(1s)); break; case ACTION_CAST_INVOCATION: diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 3c7b6fc6e0a..5011e0645c6 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -334,7 +334,7 @@ struct npc_tallhorn_stag : public ScriptedAI { me->SetStandState(UNIT_STAND_STATE_DEAD); me->SetImmuneToPC(true); - me->SetDynamicFlag(UNIT_DYNFLAG_DEAD); + me->SetUnitFlag3(UNIT_FLAG3_FAKE_DEAD); } _phase = 0; } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index be05e786856..68c6b6a7c1d 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1698,7 +1698,7 @@ class spell_gen_feign_death_all_flags : public AuraScript void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); - target->SetDynamicFlag( UNIT_DYNFLAG_DEAD); + target->SetUnitFlag3(UNIT_FLAG3_FAKE_DEAD); target->SetUnitFlag2(UNIT_FLAG2_FEIGN_DEATH); target->SetUnitFlag(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT); @@ -1709,7 +1709,7 @@ class spell_gen_feign_death_all_flags : public AuraScript void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); - target->RemoveDynamicFlag(UNIT_DYNFLAG_DEAD); + target->RemoveUnitFlag3(UNIT_FLAG3_FAKE_DEAD); target->RemoveUnitFlag2(UNIT_FLAG2_FEIGN_DEATH); target->RemoveUnitFlag(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT); @@ -1765,7 +1765,7 @@ class spell_gen_feign_death_no_prevent_emotes : public AuraScript void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); - target->SetDynamicFlag(UNIT_DYNFLAG_DEAD); + target->SetUnitFlag3(UNIT_FLAG3_FAKE_DEAD); target->SetUnitFlag2(UNIT_FLAG2_FEIGN_DEATH); if (Creature* creature = target->ToCreature()) @@ -1775,7 +1775,7 @@ class spell_gen_feign_death_no_prevent_emotes : public AuraScript void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); - target->RemoveDynamicFlag(UNIT_DYNFLAG_DEAD); + target->RemoveUnitFlag3(UNIT_FLAG3_FAKE_DEAD); target->RemoveUnitFlag2(UNIT_FLAG2_FEIGN_DEATH); if (Creature* creature = target->ToCreature()) diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 9da2dda21d6..454dc6bb33f 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -1099,7 +1099,7 @@ class spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death : public AuraSc void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); - target->SetDynamicFlag(UNIT_DYNFLAG_DEAD); + target->SetUnitFlag3(UNIT_FLAG3_FAKE_DEAD); target->SetUnitFlag2(UNIT_FLAG2_FEIGN_DEATH); if (Creature* creature = target->ToCreature()) diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 73ab948a928..201fcb4f741 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -849,7 +849,7 @@ public: me->RemoveUnitFlag(UNIT_FLAG_IN_COMBAT); me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->setDeathState(JUST_DIED); - me->SetDynamicFlag(UNIT_DYNFLAG_DEAD); + me->SetUnitFlag3(UNIT_FLAG3_FAKE_DEAD); if (!DoctorGUID.IsEmpty()) if (Creature* doctor = ObjectAccessor::GetCreature((*me), DoctorGUID)) -- cgit v1.2.3