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

[11330] Use ObjectGuid to store Totem guids instead of uint64 and fix related rare crash.

Browse source 
Signed-off-by: Ambal <pogrebniak@gala.net>
This commit is contained in:
rsa 2011-04-11 22:45:25 +03:00 • committed by Ambal
parent 735f086992
commit cd32dd9bfc
5 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/game/Unit.cpp
View file

@ -207,9 +207,6 @@ Unit::Unit()
m_addDmgOnce = 0;
for(int i = 0; i < MAX_TOTEM_SLOT; ++i)
m_TotemSlot[i] = 0;
m_ObjectSlot[0] = m_ObjectSlot[1] = m_ObjectSlot[2] = m_ObjectSlot[3] = 0;
//m_Aura = NULL;
//m_AurasCheck = 2000;
@ -6005,7 +6002,7 @@ Unit* Unit::_GetTotem(TotemSlot slot) const
Totem* Unit::GetTotem(TotemSlot slot ) const
{
if(slot >= MAX_TOTEM_SLOT || !IsInWorld())
if(slot >= MAX_TOTEM_SLOT || !IsInWorld() || m_TotemSlot[slot].IsEmpty())
return NULL;
Creature *totem = GetMap()->GetCreature(m_TotemSlot[slot]);
@ -6015,23 +6012,23 @@ Totem* Unit::GetTotem(TotemSlot slot ) const
bool Unit::IsAllTotemSlotsUsed() const
{
for (int i = 0; i < MAX_TOTEM_SLOT; ++i)
if (!m_TotemSlot[i])
if (m_TotemSlot[i].IsEmpty())
return false;
return true;
}
void Unit::_AddTotem(TotemSlot slot, Totem* totem)
{
m_TotemSlot[slot] = totem->GetGUID();
m_TotemSlot[slot] = totem->GetObjectGuid();
}
void Unit::_RemoveTotem(Totem* totem)
{
for(int i = 0; i < MAX_TOTEM_SLOT; ++i)
{
if (m_TotemSlot[i] == totem->GetGUID())
if (m_TotemSlot[i] == totem->GetObjectGuid())
{
m_TotemSlot[i] = 0;
m_TotemSlot[i].Clear();
break;
}
}