nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-17 02:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core/Misc): Make DeathState enum class (#17607)

Browse Source
This commit is contained in:
Kitzunu
2023-10-28 10:54:03 +02:00
committed by GitHub
parent 79b39f9655
commit f757e93da5
47 changed files with 112 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/scripts/Commands/cs_npc.cpp
View File

@@ -768,7 +768,7 @@ public:
if (creature->IsAlive()) // dead creature will reset movement generator at respawn
{
creature->setDeathState(JUST_DIED);
creature->setDeathState(DeathState::JustDied);
creature->Respawn();
}
}
@@ -920,7 +920,7 @@ public:
if (creature->IsAlive()) // dead creature will reset movement generator at respawn
{
creature->setDeathState(JUST_DIED);
creature->setDeathState(DeathState::JustDied);
creature->Respawn();
}
@@ -994,7 +994,7 @@ public:
if (creature->IsAlive()) // dead creature will reset movement generator at respawn
{
creature->setDeathState(JUST_DIED);
creature->setDeathState(DeathState::JustDied);
creature->Respawn();
}

4
src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp
View File

@@ -506,7 +506,7 @@ struct npc_echo_of_medivh : public ScriptedAI
piece->CombatStop();
piece->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
piece->setDeathState(JUST_RESPAWNED);
piece->setDeathState(DeathState::JustRespawned);
piece->SetHealth(piece->GetMaxHealth());
break;
}
@@ -528,7 +528,7 @@ struct npc_echo_of_medivh : public ScriptedAI
piece->CombatStop();
piece->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
piece->setDeathState(JUST_RESPAWNED);
piece->setDeathState(DeathState::JustRespawned);
piece->SetHealth(piece->GetMaxHealth());
break;
}

2
src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
View File

@@ -265,7 +265,7 @@ public:
if (Creature* piece = instance->GetCreature(chessPieceGUID))
{
piece->RemoveAllAuras();
piece->setDeathState(JUST_RESPAWNED);
piece->setDeathState(DeathState::JustRespawned);
piece->SetHealth(piece->GetMaxHealth());
float x, y, z, o;
piece->GetHomePosition(x, y, z, o);

2
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
View File

@@ -741,7 +741,7 @@ public:
break;
case 11:
Talk(EMOTE_DIES);
me->setDeathState(JUST_DIED);
me->setDeathState(DeathState::JustDied);
me->SetHealth(0);
return;
}

2
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
View File

@@ -360,7 +360,7 @@ public:
Creature* creature = (ObjectAccessor::GetCreature((*me), AddGUID[i]));
if (!creature || !creature->IsAlive())
{
if (creature) creature->setDeathState(DEAD);
if (creature) creature->setDeathState(DeathState::Dead);
creature = me->SummonCreature(AddEntry[i], Pos_X[i], POS_Y, POS_Z, ORIENT, TEMPSUMMON_DEAD_DESPAWN, 0);
if (creature) AddGUID[i] = creature->GetGUID();
}

2
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
View File

@@ -285,7 +285,7 @@ public:
if (Unit* temp = ObjectAccessor::GetUnit(*me, SpiritGUID[i]))
{
temp->SetVisible(false);
temp->setDeathState(DEAD);
temp->setDeathState(DeathState::Dead);
}
}
SpiritGUID[i].Clear();

2
src/server/scripts/EasternKingdoms/zone_undercity.cpp
View File

@@ -1300,7 +1300,7 @@ public:
{
khanokGUID = temp->GetGUID();
if (Creature* khanok = ObjectAccessor::GetCreature(*me, khanokGUID))
khanok->setDeathState(JUST_DIED);
khanok->setDeathState(DeathState::JustDied);
}
if (Unit* temp = me->SummonCreature(NPC_PUTRESS, AllianceSpawn[12].x, AllianceSpawn[12].y, AllianceSpawn[12].z, TEMPSUMMON_MANUAL_DESPAWN))
{

2
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
View File

@@ -238,7 +238,7 @@ public:
Creature* boss = ObjectAccessor::GetCreature(*me, AnetheronGUID);
if (!boss || boss->isDead())
{
me->setDeathState(JUST_DIED);
me->setDeathState(DeathState::JustDied);
me->RemoveCorpse();
return;
}

2
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
View File

@@ -245,7 +245,7 @@ public:
Creature* boss = ObjectAccessor::GetCreature(*me, AzgalorGUID);
if (!boss || boss->isDead())
{
me->setDeathState(JUST_DIED);
me->setDeathState(DeathState::JustDied);
me->RemoveCorpse();
return;
}

4
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
View File

@@ -584,7 +584,7 @@ public:
{
if ((faction == 0 && LastOverronPos == 17) || (faction == 1 && LastOverronPos == 21))
{
me->setDeathState(DEAD);
me->setDeathState(DeathState::Dead);
me->RemoveCorpse();
}
}
@@ -685,7 +685,7 @@ public:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_ATTACK_UNARMED);
if ((faction == 0 && LastOverronPos == 17) || (faction == 1 && LastOverronPos == 21))
{
me->setDeathState(DEAD);
me->setDeathState(DeathState::Dead);
me->RemoveCorpse();
}
}

2
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
View File

@@ -224,7 +224,7 @@ public:
if (!arthas->IsAlive())
{
EnsureGridLoaded();
arthas->setDeathState(DEAD);
arthas->setDeathState(DeathState::Dead);
arthas->Respawn();
}
else

2
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
View File

@@ -264,7 +264,7 @@ public:
EnsureGridLoaded();
thrall->SetVisible(false);
Reposition(thrall);
thrall->setDeathState(DEAD);
thrall->setDeathState(DeathState::Dead);
thrall->Respawn();
thrall->SetVisible(true);
SaveToDB();

6
src/server/scripts/Kalimdor/zone_moonglade.cpp
View File

@@ -387,7 +387,7 @@ public:
if (!PlayerGUID)
{
me->setDeathState(JUST_DIED);
me->setDeathState(DeathState::JustDied);
return;
}
@@ -408,7 +408,7 @@ public:
Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID);
if (!player || player->GetQuestStatus(10965) == QUEST_STATUS_NONE)
{
me->setDeathState(JUST_DIED);
me->setDeathState(DeathState::JustDied);
return;
}
@@ -532,7 +532,7 @@ public:
player->TalkedToCreature(me->GetEntry(), me->GetGUID());
PlayerGUID.Clear();
Reset();
me->setDeathState(JUST_DIED);
me->setDeathState(DeathState::JustDied);
break;
}
break;

2
src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
View File

@@ -646,7 +646,7 @@ public:
{
deathbringer->CastSpell(me, SPELL_RIDE_VEHICLE, true);
deathbringer->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
deathbringer->setDeathState(ALIVE);
deathbringer->setDeathState(DeathState::Alive);
}
_events.ScheduleEvent(EVENT_OUTRO_HORDE_4, 1000);
_events.ScheduleEvent(EVENT_OUTRO_HORDE_5, 4000);

2
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
View File

@@ -1257,7 +1257,7 @@ public:
{
if (spell->Id == SPELL_REVIVE_CHAMPION && !IsUndead)
{
me->setDeathState(JUST_RESPAWNED);
me->setDeathState(DeathState::JustRespawned);
uint32 newEntry = 0;
switch (me->GetEntry())
{

2
src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
View File

@@ -153,7 +153,7 @@ public:
if (Creature* brann = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(NPC_BRANN)))
{
brann->setDeathState(JUST_DIED);
brann->setDeathState(DeathState::JustDied);
brann->Respawn();
brann->AI()->DoAction(5);
}

2
src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
View File

@@ -601,7 +601,7 @@ public:
{
if (Creature* brann = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(NPC_BRANN)))
{
brann->setDeathState(JUST_DIED);
brann->setDeathState(DeathState::JustDied);
brann->Respawn();
brann->AI()->DoAction(5);
}

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
View File

@@ -384,7 +384,7 @@ public:
{
if (param == ACTION_FERAL_RESPAWN)
{
me->setDeathState(JUST_RESPAWNED);
me->setDeathState(DeathState::JustRespawned);
if (Player* target = SelectTargetFromPlayerList(200))
AttackStart(target);

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
View File

@@ -1109,7 +1109,7 @@ public:
{
if (_isTrio && param == ACTION_RESPAWN_TRIO)
{
me->setDeathState(JUST_RESPAWNED);
me->setDeathState(DeathState::JustRespawned);
Reset();
}
}

2
src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
View File

@@ -316,7 +316,7 @@ public:
{
creature->SetDisableGravity(true);
creature->SetPosition(creature->GetHomePosition());
creature->setDeathState(JUST_DIED);
creature->setDeathState(DeathState::JustDied);
creature->StopMovingOnCurrentPos();
}
break;

2
src/server/scripts/Northrend/zone_grizzly_hills.cpp
View File

@@ -158,7 +158,7 @@ public:
if (Mrfloppy->isDead())
{
me->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ());
Mrfloppy->setDeathState(ALIVE);
Mrfloppy->setDeathState(DeathState::Alive);
Mrfloppy->GetMotionMaster()->MoveFollow(me, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
Talk(SAY_VICTORY3);
}

2
src/server/scripts/Northrend/zone_zuldrak.cpp
View File

@@ -686,7 +686,7 @@ public:
me->DespawnOrUnsummon();
}
else
me->setDeathState(JUST_DIED);
me->setDeathState(DeathState::JustDied);
}
}
}

2
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
View File

@@ -373,7 +373,7 @@ public:
if (!Vashj || !Vashj->IsAlive() || CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->ToCreature()->AI())->Phase != 3)
{
// remove
me->setDeathState(DEAD);
me->setDeathState(DeathState::Dead);
me->RemoveCorpse();
me->SetFaction(FACTION_FRIENDLY);
}

2
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
View File

@@ -214,7 +214,7 @@ public:
if (summon->GetSpawnId())
{
summon->SetReactState(REACT_PASSIVE);
summon->setDeathState(JUST_RESPAWNED);
summon->setDeathState(DeathState::JustRespawned);
summon->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
}
}

2
src/server/scripts/Outland/zone_blades_edge_mountains.cpp
View File

@@ -325,7 +325,7 @@ public:
if (id == 0)
{
me->setDeathState(JUST_DIED);
me->setDeathState(DeathState::JustDied);
me->RemoveCorpse();
me->SetHealth(0);
}

2
src/server/scripts/Spells/spell_item.cpp
View File

@@ -2805,7 +2805,7 @@ class spell_item_shimmering_vessel : public SpellScript
void HandleDummy(SpellEffIndex /* effIndex */)
{
if (Creature* target = GetHitCreature())
target->setDeathState(JUST_RESPAWNED);
target->setDeathState(DeathState::JustRespawned);
}
void Register() override

2
src/server/scripts/World/npc_stave_of_ancients.cpp
View File

@@ -577,7 +577,7 @@ public:
Precious()->RemoveCorpse(false, false);
Precious()->SetPosition(current);
Precious()->SetHomePosition(current);
Precious()->setDeathState(JUST_RESPAWNED);
Precious()->setDeathState(DeathState::JustRespawned);
Precious()->UpdateObjectVisibility(true);
}

4
src/server/scripts/World/npcs_special.cpp
View File

@@ -1006,7 +1006,7 @@ public:
{
if (guid != savedPatient->GetGUID()) // Don't kill the last guy we just saved
if (Creature* patient = ObjectAccessor::GetCreature(*me, guid))
patient->setDeathState(JUST_DIED);
patient->setDeathState(DeathState::JustDied);
}
}
@@ -1155,7 +1155,7 @@ public:
{
me->RemoveUnitFlag(UNIT_FLAG_IN_COMBAT);
me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
me->setDeathState(JUST_DIED);
me->setDeathState(DeathState::JustDied);
me->SetDynamicFlag(32);
if (DoctorGUID)