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

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

Browse source
This commit is contained in:
UltraNix 2021-04-25 22:18:03 +02:00 • committed by GitHub
parent 91081f4ad8
commit f4c226423d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
568 changed files with 10655 additions and 11019 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
View file

@ -24,14 +24,14 @@ public:
instance_oculus_InstanceMapScript(Map* pMap) : InstanceScript(pMap) { Initialize(); }
uint32 m_auiEncounter[MAX_ENCOUNTER];
uint64 DragonCageDoorGUID[3];
uint64 EregosCacheGUID;
ObjectGuid DragonCageDoorGUID[3];
ObjectGuid EregosCacheGUID;
uint32 CentrifugeCount;
uint64 uiDrakosGUID;
uint64 uiVarosGUID;
uint64 uiUromGUID;
uint64 uiEregosGUID;
ObjectGuid uiDrakosGUID;
ObjectGuid uiVarosGUID;
ObjectGuid uiUromGUID;
ObjectGuid uiEregosGUID;
bool bAmberVoid;
bool bEmeraldVoid;
@ -39,18 +39,12 @@ public:
void Initialize() override
{
EregosCacheGUID = 0;
uiDrakosGUID = 0;
uiVarosGUID = 0;
uiUromGUID = 0;
uiEregosGUID = 0;
CentrifugeCount = 0;
bAmberVoid = false;
bEmeraldVoid = false;
bRubyVoid = false;
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
memset(&DragonCageDoorGUID, 0, sizeof(DragonCageDoorGUID));
}
void OnCreatureCreate(Creature* pCreature) override
@ -200,7 +194,7 @@ public:
return 0;
}
uint64 GetData64(uint32 identifier) const override
ObjectGuid GetGuidData(uint32 identifier) const override
{
switch( identifier )
{
@ -218,7 +212,7 @@ public:
return DragonCageDoorGUID[identifier - 100];
}
return 0;
return ObjectGuid::Empty;
}
std::string GetSaveData() override