ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(Core/Misc): Use NpcFlag helpers (#19676)

Browse source 
* chore(Core/Misc): Use HasNpcFlag instead of HasFlag

* extend to all npcflag helpers
This commit is contained in:
Kitzunu 2024-08-19 10:17:02 +02:00 • committed by GitHub
parent 1275b64ef0
commit 337135bf9e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
View file

@ -113,7 +113,7 @@ public:
scheduler.CancelAll();
if (InstanceScript* hyjal = me->GetInstanceScript())
if (!hyjal->GetData(DATA_WAVE_STATUS))
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP);
}
void JustEngagedWith(Unit* /*who*/) override
@ -138,7 +138,7 @@ public:
void IsSummonedBy(WorldObject* /*summoner*/) override
{
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP);
DoCastSelf(SPELL_SIMPLE_TELEPORT, true);
// Should wait 2400ms
@ -176,7 +176,7 @@ public:
bool OnGossipSelect(Player* /*player*/ , Creature* creature, uint32 /*sender*/, uint32 /*action*/) override
{
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
creature->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP);
if (InstanceScript* hyjal = creature->GetInstanceScript())
{
@ -213,7 +213,7 @@ public:
scheduler.CancelAll();
if (InstanceScript* hyjal = me->GetInstanceScript())
if (!hyjal->GetData(DATA_WAVE_STATUS))
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP);
}
void JustEngagedWith(Unit* /*who*/) override
@ -251,7 +251,7 @@ public:
bool OnGossipSelect(Player* /*player*/, Creature* creature, uint32 /*sender*/, uint32 /*action*/) override
{
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
creature->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP);
if (InstanceScript* hyjal = creature->GetInstanceScript())
{

4
src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
View file

@ -1790,7 +1790,7 @@ public:
if (!spellClickHandled)
return;
if (!me->GetUInt32Value(UNIT_NPC_FLAGS))
if (!me->GetNpcFlags())
return;
switch (me->GetArmor())
@ -1806,7 +1806,7 @@ public:
break;
}
me->SetUInt32Value(UNIT_NPC_FLAGS, 0);
me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE);
me->DespawnOrUnsummon(1000);
}