Add GUID to groups

--HG--
branch : trunk
This commit is contained in:
Spp
2010-05-08 01:58:47 +02:00
parent 0d06050eb4
commit d6df19cd99
16 changed files with 241 additions and 228 deletions
+4 -4
View File
@@ -140,7 +140,7 @@ bool ForcedDespawnDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
Creature::Creature() :
Unit(),
lootForPickPocketed(false), lootForBody(false), m_groupLootTimer(0), lootingGroupLeaderGUID(0),
lootForPickPocketed(false), lootForBody(false), m_groupLootTimer(0), lootingGroupGUID(0),
m_lootMoney(0), m_lootRecipient(0),
m_deathTimer(0), m_respawnTime(0), m_respawnDelay(300), m_corpseDelay(60), m_respawnradius(0.0f),
m_defaultMovementType(IDLE_MOTION_TYPE), m_DBTableGuid(0), m_equipmentId(0), m_AlreadyCallAssistance(false),
@@ -481,18 +481,18 @@ void Creature::Update(uint32 diff)
if (m_isDeadByDefault)
break;
if (m_groupLootTimer && lootingGroupLeaderGUID)
if (m_groupLootTimer && lootingGroupGUID)
{
// for delayed spells
m_Events.Update(diff);
if (m_groupLootTimer <= diff)
{
Group* group = objmgr.GetGroupByLeader(lootingGroupLeaderGUID);
Group* group = objmgr.GetGroupByGUID(lootingGroupGUID);
if (group)
group->EndRoll(&loot);
m_groupLootTimer = 0;
lootingGroupLeaderGUID = 0;
lootingGroupGUID = 0;
}
else m_groupLootTimer -= diff;
}