[11456] Some ObejctGuid uses in Pet code.

This commit is contained in:
VladimirMangos 2011-05-09 20:20:31 +04:00
parent 51031c2d24
commit 7318bb0864
4 changed files with 21 additions and 19 deletions

View file

@ -1281,7 +1281,7 @@ void Pet::_LoadAuras(uint32 timediff)
do
{
Field *fields = result->Fetch();
uint64 caster_guid = fields[0].GetUInt64();
ObjectGuid casterGuid = ObjectGuid(fields[0].GetUInt64());
uint32 item_lowguid = fields[1].GetUInt32();
uint32 spellid = fields[2].GetUInt32();
uint32 stackcount = fields[3].GetUInt32();
@ -1307,7 +1307,7 @@ void Pet::_LoadAuras(uint32 timediff)
}
// do not load single target auras (unless they were cast by the player)
if (caster_guid != GetGUID() && IsSingleTargetSpell(spellproto))
if (casterGuid != GetObjectGuid() && IsSingleTargetSpell(spellproto))
continue;
if (remaintime != -1 && !IsPositiveSpell(spellproto))
@ -1336,7 +1336,7 @@ void Pet::_LoadAuras(uint32 timediff)
stackcount = 1;
SpellAuraHolder *holder = CreateSpellAuraHolder(spellproto, this, NULL);
holder->SetLoadedState(caster_guid, ObjectGuid(HIGHGUID_ITEM, item_lowguid), stackcount, remaincharges, maxduration, remaintime);
holder->SetLoadedState(casterGuid, ObjectGuid(HIGHGUID_ITEM, item_lowguid), stackcount, remaincharges, maxduration, remaintime);
for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
{