From 46c1a4640de55db24c2c4e781af91ea0c537d4dc Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 2 Aug 2010 17:28:47 +0200 Subject: Groups are now stored by low guid in map Creatures and gameobjects also store looting group by low guid instead of full guid --HG-- branch : trunk --- src/server/game/Entities/GameObject/GameObject.cpp | 6 +++--- src/server/game/Entities/GameObject/GameObject.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/game/Entities/GameObject') diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 1dac4ba5e2e..a799992d6b6 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -63,7 +63,7 @@ GameObject::GameObject() : WorldObject(), m_goValue(new GameObjectValue) m_rotation = 0; m_groupLootTimer = 0; - lootingGroupGUID = 0; + lootingGroupLowGUID = 0; ResetLootMode(); // restore default loot mode } @@ -444,11 +444,11 @@ void GameObject::Update(uint32 diff) { if (m_groupLootTimer <= diff) { - Group* group = objmgr.GetGroupByGUID(lootingGroupGUID); + Group* group = objmgr.GetGroupByGUID(lootingGroupLowGUID); if (group) group->EndRoll(&loot); m_groupLootTimer = 0; - lootingGroupGUID = 0; + lootingGroupLowGUID = 0; } else m_groupLootTimer -= diff; } diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index e466320df71..70a09c26f11 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -719,7 +719,7 @@ class GameObject : public WorldObject, public GridObject Loot loot; uint32 m_groupLootTimer; // (msecs)timer used for group loot - uint64 lootingGroupGUID; // used to find group which is looting + uint32 lootingGroupLowGUID; // used to find group which is looting bool hasQuest(uint32 quest_id) const; bool hasInvolvedQuest(uint32 quest_id) const; -- cgit v1.2.3