josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Scripts: ScriptRegistry is no longer the part of ScriptMgr public interface, it is not required by caller side. Also remove extra function call to GetScriptId in scripts

Browse Source
This commit is contained in:
Spp-
2011-07-27 14:52:59 +02:00
parent 3e5aa2d1ff
commit 0b5c03f66b
12 changed files with 165 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
+1 -1
View File
@@ -117,7 +117,7 @@ CreatureAI* GetRubySanctumAI(Creature* creature)
{
if (InstanceMap* instance = creature->GetMap()->ToInstanceMap())
if (instance->GetInstanceScript())
if (instance->GetScriptId() == GetScriptId(RSScriptName))
if (instance->GetScriptId() == sObjectMgr->GetScriptId(RSScriptName))
return new AI(creature);
return NULL;
}
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+1 -1
View File
@@ -71,7 +71,7 @@ class boss_bronjahm : public CreatureScript
void InitializeAI()
{
if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != GetScriptId(FoSScriptName))
if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(FoSScriptName))
me->IsAIEnabled = false;
else if (!me->isDead())
Reset();
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+1 -1
View File
@@ -129,7 +129,7 @@ class boss_devourer_of_souls : public CreatureScript
void InitializeAI()
{
if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != GetScriptId(FoSScriptName))
if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(FoSScriptName))
me->IsAIEnabled = false;
else if (!me->isDead())
Reset();
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ class boss_garfrost : public CreatureScript
void InitializeAI()
{
if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != GetScriptId(PoSScriptName))
if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(PoSScriptName))
me->IsAIEnabled = false;
else if (!me->isDead())
Reset();
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+2 -2
View File
@@ -143,7 +143,7 @@ class boss_ick : public CreatureScript
void InitializeAI()
{
if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != GetScriptId(PoSScriptName))
if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(PoSScriptName))
me->IsAIEnabled = false;
else if (!me->isDead())
Reset();
@@ -297,7 +297,7 @@ class boss_krick : public CreatureScript
void InitializeAI()
{
if (!_instanceScript || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != GetScriptId(PoSScriptName))
if (!_instanceScript || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(PoSScriptName))
me->IsAIEnabled = false;
else if (!me->isDead())
Reset();
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ class boss_tyrannus : public CreatureScript
void InitializeAI()
{
if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != GetScriptId(PoSScriptName))
if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(PoSScriptName))
me->IsAIEnabled = false;
else if (instance->GetBossState(DATA_TYRANNUS) != DONE)
Reset();
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
+1 -1
View File
@@ -443,7 +443,7 @@ CreatureAI* GetIcecrownCitadelAI(Creature* creature)
{
if (InstanceMap* instance = creature->GetMap()->ToInstanceMap())
if (instance->GetInstanceScript())
if (instance->GetScriptId() == GetScriptId(ICCScriptName))
if (instance->GetScriptId() == sObjectMgr->GetScriptId(ICCScriptName))
return new AI(creature);
return NULL;
}
src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h
+1 -1
View File
@@ -190,7 +190,7 @@ CreatureAI* GetUlduarAI(Creature* creature)
{
if (InstanceMap* instance = creature->GetMap()->ToInstanceMap())
if (instance->GetInstanceScript())
if (instance->GetScriptId() == GetScriptId(UlduarScriptName))
if (instance->GetScriptId() == sObjectMgr->GetScriptId(UlduarScriptName))
return new AI(creature);
return NULL;