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

[11465] non-ObjectGuid guids in random places.

Browse source 
Only ChannelMgr code wide use uint64 guids now, and Map object stores.
This commit is contained in:
VladimirMangos 2011-05-10 21:24:43 +04:00
parent a925db80fa
commit ef6a48fe03
44 changed files with 219 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/game/Spell.cpp
View file

@ -134,7 +134,7 @@ void SpellCastTargets::setUnitTarget(Unit *target)
m_destY = target->GetPositionY();
m_destZ = target->GetPositionZ();
m_unitTarget = target;
m_unitTargetGUID = target->GetGUID();
m_unitTargetGUID = target->GetObjectGuid();
m_targetMask |= TARGET_FLAG_UNIT;
}
@ -157,7 +157,7 @@ void SpellCastTargets::setSource(float x, float y, float z)
void SpellCastTargets::setGOTarget(GameObject *target)
{
m_GOTarget = target;
m_GOTargetGUID = target->GetGUID();
m_GOTargetGUID = target->GetObjectGuid();
// m_targetMask |= TARGET_FLAG_OBJECT;
}
@ -167,7 +167,7 @@ void SpellCastTargets::setItemTarget(Item* item)
return;
m_itemTarget = item;
m_itemTargetGUID = item->GetGUID();
m_itemTargetGUID = item->GetObjectGuid();
m_itemTargetEntry = item->GetEntry();
m_targetMask |= TARGET_FLAG_ITEM;
}
@ -183,7 +183,7 @@ void SpellCastTargets::setTradeItemTarget(Player* caster)
void SpellCastTargets::setCorpseTarget(Corpse* corpse)
{
m_CorpseTargetGUID = corpse->GetGUID();
m_CorpseTargetGUID = corpse->GetObjectGuid();
}
void SpellCastTargets::Update(Unit* caster)
@ -222,7 +222,7 @@ void SpellCastTargets::read( ByteBuffer& data, Unit *caster )
m_destY = caster->GetPositionY();
m_destZ = caster->GetPositionZ();
m_unitTarget = caster;
m_unitTargetGUID = caster->GetGUID();
m_unitTargetGUID = caster->GetObjectGuid();
return;
}
@ -5321,7 +5321,7 @@ SpellCastResult Spell::CheckCast(bool strict)
if (m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->getClass() == CLASS_WARLOCK)
{
if (strict) //Summoning Disorientation, trigger pet stun (cast by pet so it doesn't attack player)
pet->CastSpell(pet, 32752, true, NULL, NULL, pet->GetGUID());
pet->CastSpell(pet, 32752, true, NULL, NULL, pet->GetObjectGuid());
}
else
return SPELL_FAILED_ALREADY_HAVE_SUMMON;