feat(Core/Misc): implement ObjectGuid class (port from TC) (#4885)

This commit is contained in:
UltraNix
2021-04-25 22:18:03 +02:00
committed by GitHub
parent 91081f4ad8
commit f4c226423d
568 changed files with 10655 additions and 11019 deletions

View File

@@ -126,7 +126,7 @@ public:
InstanceScript* instance;
uint64 m_uiSpotlightGUID;
ObjectGuid m_uiSpotlightGUID;
uint32 TalkCount;
uint32 TalkTimer;
@@ -138,7 +138,7 @@ public:
void Reset() override
{
m_uiSpotlightGUID = 0;
m_uiSpotlightGUID.Clear();
TalkCount = 0;
TalkTimer = 2000;
@@ -168,7 +168,7 @@ public:
{
case 0:
DoCast(me, SPELL_TUXEDO, false);
instance->DoUseDoorOrButton(instance->GetData64(DATA_GO_STAGEDOORLEFT));
instance->DoUseDoorOrButton(instance->GetGuidData(DATA_GO_STAGEDOORLEFT));
break;
case 4:
TalkCount = 0;
@@ -184,12 +184,12 @@ public:
}
break;
case 8:
instance->DoUseDoorOrButton(instance->GetData64(DATA_GO_STAGEDOORLEFT));
instance->DoUseDoorOrButton(instance->GetGuidData(DATA_GO_STAGEDOORLEFT));
PerformanceReady = true;
break;
case 9:
PrepareEncounter();
instance->DoUseDoorOrButton(instance->GetData64(DATA_GO_CURTAINS));
instance->DoUseDoorOrButton(instance->GetGuidData(DATA_GO_CURTAINS));
break;
}
}
@@ -437,7 +437,7 @@ public:
InstanceScript* instance;
uint64 ArcanagosGUID;
ObjectGuid ArcanagosGUID;
uint32 YellTimer;
uint8 Step;
@@ -448,11 +448,11 @@ public:
void Reset() override
{
ArcanagosGUID = 0;
ArcanagosGUID.Clear();
MTimer = 0;
ATimer = 0;
if (instance && instance->GetData64(DATA_IMAGE_OF_MEDIVH) == 0)
if (instance && !instance->GetGuidData(DATA_IMAGE_OF_MEDIVH))
{
Creature* Arcanagos = me->SummonCreature(NPC_ARCANAGOS, ArcanagosPos[0], ArcanagosPos[1], ArcanagosPos[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
if (!Arcanagos)
@@ -461,7 +461,7 @@ public:
return;
}
instance->SetData64(DATA_IMAGE_OF_MEDIVH, me->GetGUID());
instance->SetGuidData(DATA_IMAGE_OF_MEDIVH, me->GetGUID());
EventStarted = true;
ArcanagosGUID = Arcanagos->GetGUID();