mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11573] Add CreatureInfo::GetObjectGuid

Browse source 
Also remove redundent CreatureData::GetHighGuid
This commit is contained in:
VladimirMangos 2011-05-31 02:46:43 +04:00
parent 442e06090d
commit 8698ac207d
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Creature.cpp
View file

@ -50,10 +50,10 @@
#include "Policies/SingletonImp.h"
HighGuid CreatureData::GetHighGuid() const
ObjectGuid CreatureData::GetObjectGuid(uint32 lowguid) const
{
// info existence checked at loading
return ObjectMgr::GetCreatureTemplate(id)->GetHighGuid();
return ObjectMgr::GetCreatureTemplate(id)->GetObjectGuid(lowguid);
}
TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const
@ -1280,7 +1280,7 @@ bool Creature::LoadFromDB(uint32 guidlow, Map *map)
GameEventCreatureData const* eventData = sGameEventMgr.GetCreatureUpdateDataForActiveEvent(guidlow);
// Creature can be loaded already in map if grid has been unloaded while creature walk to another grid
if (map->GetCreature(data->GetObjectGuid(guidlow)))
if (map->GetCreature(cinfo->GetObjectGuid(guidlow)))
return false;
CreatureCreatePos pos(map, data->posX, data->posY, data->posZ, data->orientation, data->phaseMask);