* Rename InstanceData to InstanceScript
* Rename *mgr to their new names in scripts project * Mass convert all the scripts (NEEDS THOROUGH TESTING, because it was done automatically) Please, report bugs on issue tracker. --HG-- branch : trunk rename : src/server/game/Instances/InstanceData.cpp => src/server/game/Instances/InstanceScript.cpp rename : src/server/game/Instances/InstanceData.h => src/server/game/Instances/InstanceScript.h
This commit is contained in:
@@ -50,10 +50,10 @@ class boss_broggok : public CreatureScript
|
||||
{
|
||||
boss_broggokAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
}
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
InstanceScript* pInstance;
|
||||
|
||||
uint32 AcidSpray_Timer;
|
||||
uint32 PoisonSpawn_Timer;
|
||||
|
||||
+2
-2
@@ -80,12 +80,12 @@ class boss_kelidan_the_breaker : public CreatureScript
|
||||
{
|
||||
boss_kelidan_the_breakerAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
for (uint8 i=0; i<5; ++i)
|
||||
Channelers[i] = 0;
|
||||
}
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
InstanceScript* pInstance;
|
||||
|
||||
uint32 ShadowVolley_Timer;
|
||||
uint32 BurningNova_Timer;
|
||||
|
||||
@@ -54,10 +54,10 @@ class boss_the_maker : public CreatureScript
|
||||
{
|
||||
boss_the_makerAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
}
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
InstanceScript* pInstance;
|
||||
|
||||
uint32 AcidSpray_Timer;
|
||||
uint32 ExplodingBreaker_Timer;
|
||||
|
||||
@@ -38,9 +38,9 @@ class instance_blood_furnace : public InstanceMapScript
|
||||
{
|
||||
}
|
||||
|
||||
struct instance_blood_furnace_InstanceMapScript : public ScriptedInstance
|
||||
struct instance_blood_furnace_InstanceMapScript : public InstanceScript
|
||||
{
|
||||
instance_blood_furnace_InstanceMapScript(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
|
||||
instance_blood_furnace_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
|
||||
|
||||
uint64 The_MakerGUID;
|
||||
uint64 BroggokGUID;
|
||||
@@ -226,7 +226,7 @@ class instance_blood_furnace : public InstanceMapScript
|
||||
}
|
||||
};
|
||||
|
||||
InstanceData* GetInstanceData(Map* pMap) const
|
||||
InstanceScript* GetInstanceScript(Map* pMap) const
|
||||
{
|
||||
return new instance_blood_furnace_InstanceMapScript(pMap);
|
||||
}
|
||||
|
||||
+3
-3
@@ -34,9 +34,9 @@ class instance_ramparts : public InstanceMapScript
|
||||
{
|
||||
}
|
||||
|
||||
struct instance_ramparts_InstanceMapScript : public ScriptedInstance
|
||||
struct instance_ramparts_InstanceMapScript : public InstanceScript
|
||||
{
|
||||
instance_ramparts_InstanceMapScript(Map* pMap) : ScriptedInstance(pMap) {Initialize();}
|
||||
instance_ramparts_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();}
|
||||
|
||||
uint32 m_auiEncounter[MAX_ENCOUNTER];
|
||||
uint64 m_uiChestNGUID;
|
||||
@@ -83,7 +83,7 @@ class instance_ramparts : public InstanceMapScript
|
||||
}
|
||||
};
|
||||
|
||||
InstanceData* GetInstanceData(Map* pMap) const
|
||||
InstanceScript* GetInstanceScript(Map* pMap) const
|
||||
{
|
||||
return new instance_ramparts_InstanceMapScript(pMap);
|
||||
}
|
||||
|
||||
@@ -217,7 +217,7 @@ class boss_magtheridon : public CreatureScript
|
||||
{
|
||||
boss_magtheridonAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10);
|
||||
me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10);
|
||||
|
||||
@@ -238,7 +238,7 @@ class boss_magtheridon : public CreatureScript
|
||||
|
||||
CubeMap Cube;
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
InstanceScript* pInstance;
|
||||
|
||||
uint32 Berserk_Timer;
|
||||
uint32 Quake_Timer;
|
||||
@@ -497,10 +497,10 @@ class mob_hellfire_channeler : public CreatureScript
|
||||
{
|
||||
mob_hellfire_channelerAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
}
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
InstanceScript* pInstance;
|
||||
|
||||
uint32 ShadowBoltVolley_Timer;
|
||||
uint32 DarkMending_Timer;
|
||||
@@ -613,7 +613,7 @@ public:
|
||||
|
||||
bool OnGossipHello(Player *pPlayer, GameObject * pGO)
|
||||
{
|
||||
ScriptedInstance* pInstance = pGO->GetInstanceData();
|
||||
InstanceScript* pInstance = pGO->GetInstanceScript();
|
||||
|
||||
if (!pInstance)
|
||||
return true;
|
||||
|
||||
+3
-3
@@ -48,9 +48,9 @@ class instance_magtheridons_lair : public InstanceMapScript
|
||||
{
|
||||
}
|
||||
|
||||
struct instance_magtheridons_lair_InstanceMapScript : public ScriptedInstance
|
||||
struct instance_magtheridons_lair_InstanceMapScript : public InstanceScript
|
||||
{
|
||||
instance_magtheridons_lair_InstanceMapScript(Map* pMap) : ScriptedInstance(pMap)
|
||||
instance_magtheridons_lair_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
|
||||
{
|
||||
Initialize();
|
||||
}
|
||||
@@ -251,7 +251,7 @@ class instance_magtheridons_lair : public InstanceMapScript
|
||||
}
|
||||
};
|
||||
|
||||
InstanceData* GetInstanceData(Map* pMap) const
|
||||
InstanceScript* GetInstanceScript(Map* pMap) const
|
||||
{
|
||||
return new instance_magtheridons_lair_InstanceMapScript(pMap);
|
||||
}
|
||||
|
||||
@@ -91,10 +91,10 @@ class boss_grand_warlock_nethekurse : public CreatureScript
|
||||
{
|
||||
boss_grand_warlock_nethekurseAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
}
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
InstanceScript* pInstance;
|
||||
|
||||
bool IntroOnce;
|
||||
bool IsIntroEvent;
|
||||
@@ -321,10 +321,10 @@ class mob_fel_orc_convert : public CreatureScript
|
||||
{
|
||||
mob_fel_orc_convertAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
}
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
InstanceScript* pInstance;
|
||||
uint32 Hemorrhage_Timer;
|
||||
|
||||
void Reset()
|
||||
@@ -410,7 +410,7 @@ class mob_lesser_shadow_fissure : public CreatureScript
|
||||
void EnterCombat(Unit* /*who*/) {}
|
||||
};
|
||||
|
||||
CreatureAI* GetAI_mob_lesser_shadow_fissure(Creature* pCreature)
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
{
|
||||
return new mob_lesser_shadow_fissureAI (pCreature);
|
||||
}
|
||||
|
||||
+3
-3
@@ -164,10 +164,10 @@ class boss_warbringer_omrogg : public CreatureScript
|
||||
{
|
||||
LeftHeadGUID = 0;
|
||||
RightHeadGUID = 0;
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
}
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
InstanceScript* pInstance;
|
||||
|
||||
uint64 LeftHeadGUID;
|
||||
uint64 RightHeadGUID;
|
||||
@@ -414,7 +414,7 @@ class boss_warbringer_omrogg : public CreatureScript
|
||||
}
|
||||
};
|
||||
|
||||
CreatureAI* GetAI_boss_warbringer_omrogg(Creature* pCreature)
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
{
|
||||
return new boss_warbringer_omroggAI (pCreature);
|
||||
}
|
||||
|
||||
+3
-3
@@ -37,9 +37,9 @@ class instance_shattered_halls : public InstanceMapScript
|
||||
: InstanceMapScript("instance_shattered_halls")
|
||||
{
|
||||
}
|
||||
struct instance_shattered_halls_InstanceMapScript : public ScriptedInstance
|
||||
struct instance_shattered_halls_InstanceMapScript : public InstanceScript
|
||||
{
|
||||
instance_shattered_halls_InstanceMapScript(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
|
||||
instance_shattered_halls_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
|
||||
|
||||
uint32 m_auiEncounter[MAX_ENCOUNTER];
|
||||
uint64 nethekurseGUID;
|
||||
@@ -111,7 +111,7 @@ class instance_shattered_halls : public InstanceMapScript
|
||||
}
|
||||
};
|
||||
|
||||
InstanceData* GetInstanceData(Map* pMap) const
|
||||
InstanceScript* GetInstanceScript(Map* pMap) const
|
||||
{
|
||||
return new instance_shattered_halls_InstanceMapScript(pMap);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user