diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-27 12:03:35 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-27 12:03:35 +0100 |
| commit | 7afab9f783fff331e9c99d85384f39029b35d2fa (patch) | |
| tree | 1b7683d3773a31639c8e93576557a44e8f592dce /src/server/game/Entities/Creature | |
| parent | 8b75b7e638676fea2d7c2c3a43e1ecb0f6a099d9 (diff) | |
Core/Entities: Updated HighGuid values
Diffstat (limited to 'src/server/game/Entities/Creature')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index fce6ac71815..8bf1aaf83a9 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -472,7 +472,7 @@ void Creature::Update(uint32 diff) if (!allowed) // Will be rechecked on next Update call break; - ObjectGuid dbtableHighGuid(HIGHGUID_UNIT, GetEntry(), m_DBTableGuid); + ObjectGuid dbtableHighGuid(HighGuid::Creature, GetEntry(), m_DBTableGuid); time_t linkedRespawntime = GetMap()->GetLinkedRespawnTime(dbtableHighGuid); if (!linkedRespawntime) // Can respawn Respawn(); @@ -1194,7 +1194,7 @@ bool Creature::CreateFromProto(ObjectGuid::LowType guidlow, uint32 entry, Creatu SetOriginalEntry(entry); - Object::_Create(guidlow, entry, (vehId || cinfo->VehicleId) ? HIGHGUID_VEHICLE : HIGHGUID_UNIT); + Object::_Create(guidlow, entry, (vehId || cinfo->VehicleId) ? HighGuid::Vehicle : HighGuid::Creature); if (!UpdateEntry(entry, data)) return false; @@ -1229,11 +1229,11 @@ bool Creature::LoadCreatureFromDB(ObjectGuid::LowType guid, Map* map, bool addTo m_DBTableGuid = guid; if (map->GetInstanceId() == 0) { - if (map->GetCreature(ObjectGuid(HIGHGUID_UNIT, data->id, guid))) + if (map->GetCreature(ObjectGuid(HighGuid::Creature, data->id, guid))) return false; } else - guid = sObjectMgr->GetGenerator<HIGHGUID_UNIT>()->Generate(); + guid = sObjectMgr->GetGenerator<HighGuid::Creature>()->Generate(); if (!Create(guid, map, data->phaseMask, data->id, data->posX, data->posY, data->posZ, data->orientation, data)) return false; |