aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/EasternKingdoms/ScarletMonastery
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2022-03-27 18:14:47 +0200
committerShauren <shauren.trinity@gmail.com>2022-03-27 18:14:47 +0200
commitb47185cabfbdeeaf492bf2303635db07ce703785 (patch)
treea162947c7357e964ef991471fe5a40b44f6bbbcf /src/server/scripts/EasternKingdoms/ScarletMonastery
parent4eba9786708dd3b22d9053c1a14eac7e6d03242e (diff)
Core/Misc: Rename AddXXXFlag updatefield functions to SetXXXFlag
Diffstat (limited to 'src/server/scripts/EasternKingdoms/ScarletMonastery')
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp10
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index 59a18e07dff..6364e35974a 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -197,7 +197,7 @@ struct npc_headless_horseman_head : public PassiveAI
void HandleInitialSetup()
{
DoCastSelf(SPELL_HEADLESS_HORSEMAN_C_HEAD_STUN);
- me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
+ me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
_phase = PHASE_1;
_events.SetPhase(PHASE_1);
}
@@ -309,11 +309,11 @@ struct npc_headless_horseman_head : public PassiveAI
DoCast(horseman, SPELL_HEADLESS_HORSEMAN_C_RETURN_HEAD, true);
me->RemoveAllAttackers();
me->GetMotionMaster()->Clear();
- me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
+ me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
break;
case EVENT_RAIN_OF_TREATS:
DoCastSelf(SPELL_RAIN_OF_TREATS);
- me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
+ me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
_instance->SetData(DATA_PREPARE_RESET, 0);
if (GameObject* pumpkin = me->SummonGameObject(GO_PUMPKIN_SHRINE, GOPumpkinSpawnPosition, GOPumpkinSpawnQuat, 7_days))
me->RemoveGameObject(pumpkin, false);
@@ -706,7 +706,7 @@ struct npc_sir_thomas : public PassiveAI
void Reset() override
{
me->RemoveNpcFlag(UNIT_NPC_FLAG_QUESTGIVER);
- me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
+ me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
DoCastSelf(SPELL_HEADLESS_HORSEMAN_WISP_INVIS);
_scheduler.Schedule(9s, [this](TaskContext /*context*/)
@@ -720,7 +720,7 @@ struct npc_sir_thomas : public PassiveAI
if (spellInfo->Id == SPELL_HEADLESS_HORSEMAN_WISP_FLIGHT_PORT)
{
me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
- me->AddNpcFlag(UNIT_NPC_FLAG_QUESTGIVER);
+ me->SetNpcFlag(UNIT_NPC_FLAG_QUESTGIVER);
me->RemoveAurasDueToSpell(SPELL_HEADLESS_HORSEMAN_WISP_INVIS);
DoCastSelf(SPELL_HEADLESS_HORSEMAN_C_GHOST_VISUAL, true);
}
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
index 1a98e9d6cbb..ce94275294c 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
@@ -95,7 +95,7 @@ public:
_killYellTimer.Reset(0s);
DoCastSelf(SPELL_RETRIBUTION_AURA, true);
- me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_NON_ATTACKABLE));
+ me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_NON_ATTACKABLE);
me->SetStandState(UNIT_STAND_STATE_STAND);
me->SetReactState(REACT_AGGRESSIVE);
@@ -168,7 +168,7 @@ public:
me->InterruptNonMeleeSpells(true);
me->RemoveAllAuras();
me->ClearAllReactives();
- me->AddUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_NON_ATTACKABLE));
+ me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_NON_ATTACKABLE);
me->SetStandState(UNIT_STAND_STATE_DEAD);
me->SetReactState(REACT_PASSIVE); // prevent Mograine from attacking while fake death
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
index 256a914b6da..94963564991 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
@@ -71,7 +71,7 @@ class instance_scarlet_monastery : public InstanceMapScript
_horsemanState = IN_PROGRESS;
for (uint32 data : {DATA_PUMPKIN_SHRINE, DATA_LOOSELY_TURNED_SOIL})
if (GameObject* gob = GetGameObject(data))
- gob->AddFlag(GO_FLAG_NOT_SELECTABLE);
+ gob->SetFlag(GO_FLAG_NOT_SELECTABLE);
instance->SummonCreature(NPC_HEADLESS_HORSEMAN_HEAD, HeadlessHorsemanHeadSpawnPosition);
instance->SummonCreature(NPC_FLAME_BUNNY, BunnySpawnPosition);