diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-05-04 12:39:36 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-05-04 12:39:36 +0200 |
| commit | edbd44a67530f2938864fd054182553b3d5ab1ac (patch) | |
| tree | 7648042a373a66cce81fb9721c77f163ac54fb08 /src/server/game/Events/GameEventMgr.h | |
| parent | 06caa18119ce3e2d7ff1308c9b65595d08993d47 (diff) | |
Core/Creatures: Extended npcflags to uint64
Diffstat (limited to 'src/server/game/Events/GameEventMgr.h')
| -rw-r--r-- | src/server/game/Events/GameEventMgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index bbddd5698d8..5edd6f3da2d 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -124,7 +124,7 @@ class GameEventMgr void StopEvent(uint16 event_id, bool overwrite = false); void HandleQuestComplete(uint32 quest_id); // called on world event type quest completions void HandleWorldEventGossip(Player* player, Creature* c); - uint32 GetNPCFlag(Creature* cr); + uint64 GetNPCFlag(Creature* cr); uint32 GetNpcTextId(uint32 guid); uint16 GetEventIdForQuest(Quest const* quest) const; private: @@ -162,7 +162,7 @@ class GameEventMgr typedef std::list<NPCVendorEntry> NPCVendorList; typedef std::vector<NPCVendorList> GameEventNPCVendorMap; typedef std::map<uint32 /*quest id*/, GameEventQuestToEventConditionNum> QuestIdToEventConditionMap; - typedef std::pair<ObjectGuid::LowType /*guid*/, uint32 /*npcflag*/> GuidNPCFlagPair; + typedef std::pair<ObjectGuid::LowType /*guid*/, uint64 /*npcflag*/> GuidNPCFlagPair; typedef std::list<GuidNPCFlagPair> NPCFlagList; typedef std::vector<NPCFlagList> GameEventNPCFlagMap; typedef std::vector<uint32> GameEventBitmask; |