aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Events/GameEventMgr.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-05-04 12:39:36 +0200
committerShauren <shauren.trinity@gmail.com>2015-05-04 12:39:36 +0200
commitedbd44a67530f2938864fd054182553b3d5ab1ac (patch)
tree7648042a373a66cce81fb9721c77f163ac54fb08 /src/server/game/Events/GameEventMgr.cpp
parent06caa18119ce3e2d7ff1308c9b65595d08993d47 (diff)
Core/Creatures: Extended npcflags to uint64
Diffstat (limited to 'src/server/game/Events/GameEventMgr.cpp')
-rw-r--r--src/server/game/Events/GameEventMgr.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index 00d6afdd6e4..ba247dbd19e 100644
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -715,7 +715,7 @@ void GameEventMgr::LoadFromDB()
ObjectGuid::LowType guid = fields[0].GetUInt64();
uint16 event_id = fields[1].GetUInt8();
- uint32 npcflag = fields[2].GetUInt32();
+ uint64 npcflag = fields[2].GetUInt64();
if (event_id >= mGameEvent.size())
{
@@ -916,9 +916,9 @@ void GameEventMgr::LoadFromDB()
}
}
-uint32 GameEventMgr::GetNPCFlag(Creature* cr)
+uint64 GameEventMgr::GetNPCFlag(Creature* cr)
{
- uint32 mask = 0;
+ uint64 mask = 0;
ObjectGuid::LowType guid = cr->GetSpawnId();
for (ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr)
@@ -1139,7 +1139,7 @@ void GameEventMgr::UpdateEventNPCFlags(uint16 event_id)
if (CreatureTemplate const* creatureTemplate = creature->GetCreatureTemplate())
npcflag |= creatureTemplate->npcflag;
- creature->SetUInt32Value(UNIT_NPC_FLAGS, npcflag);
+ creature->SetUInt64Value(UNIT_NPC_FLAGS, npcflag);
// reset gossip options, since the flag change might have added / removed some
//cr->ResetGossipOptions();
}