aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Events/GameEventMgr.cpp
diff options
context:
space:
mode:
authorleak <leakzx@googlemail.com>2011-04-28 22:57:08 +0200
committerleak <leakzx@googlemail.com>2011-04-28 22:57:08 +0200
commitc51c817a4510dd193f79e03ac21de51f43f0a33e (patch)
tree5afc313478460ab84cf1214c27ec109f7b53babe /src/server/game/Events/GameEventMgr.cpp
parente2e9431ca3b4725f29e13350eb9ca0b46cc0aff1 (diff)
Core/ObjectMgr: Refactor sCreatureStorage
Diffstat (limited to 'src/server/game/Events/GameEventMgr.cpp')
-rwxr-xr-xsrc/server/game/Events/GameEventMgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index 654d69e4e4b..d4d6bccfe67 100755
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -1114,7 +1114,7 @@ void GameEventMgr::UpdateEventNPCFlags(uint16 event_id)
if (cr)
{
uint32 npcflag = GetNPCFlag(cr);
- if (const CreatureInfo * ci = cr->GetCreatureInfo())
+ if (const CreatureTemplate * ci = cr->GetCreatureInfo())
npcflag |= ci->npcflag;
cr->SetUInt32Value(UNIT_NPC_FLAGS,npcflag);
// reset gossip options, since the flag change might have added / removed some
@@ -1330,7 +1330,7 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate)
CreatureData const* data2 = sObjectMgr->GetCreatureData(itr->first);
if (data2 && activate)
{
- CreatureInfo const *cinfo = ObjectMgr::GetCreatureTemplate(data2->id);
+ CreatureTemplate const *cinfo = sObjectMgr->GetCreatureTemplate(data2->id);
uint32 displayID = sObjectMgr->ChooseDisplayId(0,cinfo,data2);
CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(displayID);