nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-21 20:56:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
568 changed files with 10655 additions and 11019 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
View File

@@ -25,9 +25,6 @@ public:
_statuePhase = 0;
_defendersKilled = 0;
memset(&_encounters, 0, sizeof(_encounters));
_forcefieldGUID = 0;
_jammalanGUID = 0;
}
void OnCreatureCreate(Creature* creature) override
@@ -39,7 +36,7 @@ public:
break;
}
if (creature->IsAlive() && creature->GetDBTableGUIDLow() && creature->GetCreatureType() == CREATURE_TYPE_DRAGONKIN && creature->GetEntry() != NPC_SHADE_OF_ERANIKUS)
if (creature->IsAlive() && creature->GetSpawnId() && creature->GetCreatureType() == CREATURE_TYPE_DRAGONKIN && creature->GetEntry() != NPC_SHADE_OF_ERANIKUS)
_dragonkinList.push_back(creature->GetGUID());
}
@@ -99,9 +96,9 @@ public:
}
break;
case DATA_ERANIKUS_FIGHT:
for (std::list<uint64>::const_iterator itr = _dragonkinList.begin(); itr != _dragonkinList.end(); ++itr)
for (ObjectGuid const guid : _dragonkinList)
{
if (Creature* creature = instance->GetCreature(*itr))
if (Creature* creature = instance->GetCreature(guid))
if (instance->IsGridLoaded(creature->GetPositionX(), creature->GetPositionY()))
creature->SetInCombatWithZone();
}
@@ -180,9 +177,9 @@ public:
uint32 _defendersKilled;
uint32 _encounters[MAX_ENCOUNTERS];
uint64 _forcefieldGUID;
uint64 _jammalanGUID;
std::list<uint64> _dragonkinList;
ObjectGuid _forcefieldGUID;
ObjectGuid _jammalanGUID;
GuidList _dragonkinList;
EventMap _events;
};