From 28004eafbf0cce32ad1acd4a1c9d1fe9228fc896 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Tue, 4 Jan 2011 22:46:25 +0300 Subject: [PATCH] [10961] Avoid use scripting support wrappers for internal server code. --- src/game/CreatureEventAI.cpp | 6 +++--- src/game/Map.cpp | 4 ++-- src/game/ObjectMgr.cpp | 2 +- src/shared/revision_nr.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp index 952ad235db8..6409c6e4f2e 100644 --- a/src/game/CreatureEventAI.cpp +++ b/src/game/CreatureEventAI.cpp @@ -460,7 +460,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32 m_creature->setFaction(action.set_faction.factionId); else { - if (CreatureInfo const* ci = GetCreatureTemplateStore(m_creature->GetEntry())) + if (CreatureInfo const* ci = ObjectMgr::GetCreatureTemplate(m_creature->GetEntry())) { //if no id provided, assume reset and then use default if (m_creature->getFaction() != ci->faction_A) @@ -476,7 +476,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32 //set model based on entry from creature_template if (action.morph.creatureId) { - if (CreatureInfo const* ci = GetCreatureTemplateStore(action.morph.creatureId)) + if (CreatureInfo const* ci = ObjectMgr::GetCreatureTemplate(action.morph.creatureId)) { uint32 display_id = Creature::ChooseDisplayId(ci); m_creature->SetDisplayId(display_id); @@ -836,7 +836,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32 // set model based on entry from creature_template if (action.mount.creatureId) { - if (CreatureInfo const* cInfo = GetCreatureTemplateStore(action.mount.creatureId)) + if (CreatureInfo const* cInfo = ObjectMgr::GetCreatureTemplate(action.mount.creatureId)) { uint32 display_id = Creature::ChooseDisplayId(cInfo); m_creature->Mount(display_id); diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 5a48b586d97..bf85f6859a8 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -2714,7 +2714,7 @@ void Map::ScriptsProcess() pOwner->SetDisplayId(step.script->morph.creatureOrModelEntry); else { - CreatureInfo const* ci = GetCreatureTemplateStore(step.script->morph.creatureOrModelEntry); + CreatureInfo const* ci = ObjectMgr::GetCreatureTemplate(step.script->morph.creatureOrModelEntry); uint32 display_id = Creature::ChooseDisplayId(ci); pOwner->SetDisplayId(display_id); @@ -2771,7 +2771,7 @@ void Map::ScriptsProcess() pOwner->Mount(step.script->mount.creatureOrModelEntry); else { - CreatureInfo const* ci = GetCreatureTemplateStore(step.script->mount.creatureOrModelEntry); + CreatureInfo const* ci = ObjectMgr::GetCreatureTemplate(step.script->mount.creatureOrModelEntry); uint32 display_id = Creature::ChooseDisplayId(ci); pOwner->Mount(display_id); diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 089e674e364..9db8cda8470 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -8084,7 +8084,7 @@ void ObjectMgr::LoadMailLevelRewards() continue; } - if(!GetCreatureTemplateStore(senderEntry)) + if(!GetCreatureTemplate(senderEntry)) { sLog.outErrorDb("Table `mail_level_reward` have nonexistent sender creature entry (%u) for level %u that invalid not include any player races, ignoring.",senderEntry,level); continue; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index c94ffcb668a..af4b830f680 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10960" + #define REVISION_NR "10961" #endif // __REVISION_NR_H__