* 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:
@@ -82,11 +82,11 @@ class boss_alar : public CreatureScript
|
||||
{
|
||||
boss_alarAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
DefaultMoveSpeedRate = pCreature->GetSpeedRate(MOVE_RUN);
|
||||
}
|
||||
|
||||
ScriptedInstance *pInstance;
|
||||
InstanceScript *pInstance;
|
||||
|
||||
WaitEventType WaitEvent;
|
||||
uint32 WaitTimer;
|
||||
@@ -469,12 +469,12 @@ class mob_ember_of_alar : public CreatureScript
|
||||
{
|
||||
mob_ember_of_alarAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
pCreature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING);
|
||||
pCreature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true);
|
||||
}
|
||||
|
||||
ScriptedInstance *pInstance;
|
||||
InstanceScript *pInstance;
|
||||
bool toDie;
|
||||
|
||||
void Reset()
|
||||
|
||||
@@ -84,13 +84,13 @@ class boss_high_astromancer_solarian : public CreatureScript
|
||||
{
|
||||
boss_high_astromancer_solarianAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
|
||||
defaultarmor = pCreature->GetArmor();
|
||||
defaultsize = pCreature->GetFloatValue(OBJECT_FIELD_SCALE_X);
|
||||
}
|
||||
|
||||
ScriptedInstance *pInstance;
|
||||
InstanceScript *pInstance;
|
||||
SummonList Summons;
|
||||
|
||||
uint8 Phase;
|
||||
@@ -418,10 +418,10 @@ class mob_solarium_priest : public CreatureScript
|
||||
{
|
||||
mob_solarium_priestAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
}
|
||||
|
||||
ScriptedInstance *pInstance;
|
||||
InstanceScript *pInstance;
|
||||
|
||||
uint32 healTimer;
|
||||
uint32 holysmiteTimer;
|
||||
|
||||
@@ -147,11 +147,11 @@ struct advisorbase_ai : public ScriptedAI
|
||||
{
|
||||
advisorbase_ai(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
m_pInstance = pCreature->GetInstanceData();
|
||||
m_pInstance = pCreature->GetInstanceScript();
|
||||
m_bDoubled_Health = false;
|
||||
}
|
||||
|
||||
ScriptedInstance* m_pInstance;
|
||||
InstanceScript* m_pInstance;
|
||||
bool FakeDeath;
|
||||
bool m_bDoubled_Health;
|
||||
uint32 DelayRes_Timer;
|
||||
@@ -281,11 +281,11 @@ class boss_kaelthas : public CreatureScript
|
||||
{
|
||||
boss_kaelthasAI(Creature* pCreature) : ScriptedAI(pCreature), summons(me)
|
||||
{
|
||||
m_pInstance = pCreature->GetInstanceData();
|
||||
m_pInstance = pCreature->GetInstanceScript();
|
||||
memset(&m_auiAdvisorGuid, 0, sizeof(m_auiAdvisorGuid));
|
||||
}
|
||||
|
||||
ScriptedInstance* m_pInstance;
|
||||
InstanceScript* m_pInstance;
|
||||
|
||||
uint32 Fireball_Timer;
|
||||
uint32 ArcaneDisruption_Timer;
|
||||
@@ -1573,7 +1573,7 @@ class mob_phoenix_egg_tk : public CreatureScript
|
||||
}
|
||||
};
|
||||
|
||||
CreatureAI* GetAI_mob_phoenix_egg_tk(Creature* pCreature)
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
{
|
||||
return new mob_phoenix_egg_tkAI(pCreature);
|
||||
}
|
||||
|
||||
@@ -55,10 +55,10 @@ class boss_void_reaver : public CreatureScript
|
||||
{
|
||||
boss_void_reaverAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
}
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
InstanceScript* pInstance;
|
||||
|
||||
uint32 Pounding_Timer;
|
||||
uint32 ArcaneOrb_Timer;
|
||||
|
||||
@@ -43,9 +43,9 @@ class instance_mechanar : public InstanceMapScript
|
||||
{
|
||||
}
|
||||
|
||||
struct instance_the_eye_InstanceMapScript : public ScriptedInstance
|
||||
struct instance_the_eye_InstanceMapScript : public InstanceScript
|
||||
{
|
||||
instance_the_eye_InstanceMapScript(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
|
||||
instance_the_eye_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
|
||||
|
||||
uint64 ThaladredTheDarkener;
|
||||
uint64 LordSanguinar;
|
||||
@@ -194,7 +194,7 @@ class instance_mechanar : public InstanceMapScript
|
||||
}
|
||||
};
|
||||
|
||||
InstanceData* GetInstanceData(InstanceMap* pMap) const
|
||||
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
|
||||
{
|
||||
return new instance_the_eye_InstanceMapScript(pMap);
|
||||
}
|
||||
|
||||
@@ -63,10 +63,10 @@ class boss_nethermancer_sepethrea : public CreatureScript
|
||||
{
|
||||
boss_nethermancer_sepethreaAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
}
|
||||
|
||||
ScriptedInstance *pInstance;
|
||||
InstanceScript *pInstance;
|
||||
|
||||
uint32 frost_attack_Timer;
|
||||
uint32 arcane_blast_Timer;
|
||||
@@ -186,10 +186,10 @@ class mob_ragin_flames : public CreatureScript
|
||||
{
|
||||
mob_ragin_flamesAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
}
|
||||
|
||||
ScriptedInstance *pInstance;
|
||||
InstanceScript *pInstance;
|
||||
|
||||
uint32 inferno_Timer;
|
||||
uint32 flame_timer;
|
||||
|
||||
@@ -192,7 +192,7 @@ class boss_pathaleon_the_calculator : public CreatureScript
|
||||
}
|
||||
};
|
||||
|
||||
CreatureAI* GetAI_boss_pathaleon_the_calculator(Creature* pCreature)
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
{
|
||||
return new boss_pathaleon_the_calculatorAI (pCreature);
|
||||
}
|
||||
@@ -267,7 +267,7 @@ class mob_nether_wraith : public CreatureScript
|
||||
}
|
||||
};
|
||||
|
||||
CreatureAI* GetAI_mob_nether_wraith(Creature* pCreature)
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
{
|
||||
return new mob_nether_wraithAI (pCreature);
|
||||
}
|
||||
|
||||
@@ -36,9 +36,9 @@ class instance_mechanar : public InstanceMapScript
|
||||
{
|
||||
}
|
||||
|
||||
struct instance_mechanar_InstanceMapScript : public ScriptedInstance
|
||||
struct instance_mechanar_InstanceMapScript : public InstanceScript
|
||||
{
|
||||
instance_mechanar_InstanceMapScript(Map* pMap) : ScriptedInstance(pMap) { Initialize(); };
|
||||
instance_mechanar_InstanceMapScript(Map* pMap) : InstanceScript(pMap) { Initialize(); };
|
||||
|
||||
uint32 m_auiEncounter[MAX_ENCOUNTER];
|
||||
|
||||
@@ -79,7 +79,7 @@ class instance_mechanar : public InstanceMapScript
|
||||
}
|
||||
}
|
||||
};
|
||||
InstanceData* GetInstanceData(InstanceMap* pMap) const
|
||||
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
|
||||
{
|
||||
return new instance_mechanar_InstanceMapScript(pMap);
|
||||
}
|
||||
|
||||
@@ -78,10 +78,10 @@ class npc_millhouse_manastorm : public CreatureScript
|
||||
{
|
||||
npc_millhouse_manastormAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
}
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
InstanceScript* pInstance;
|
||||
|
||||
uint32 EventProgress_Timer;
|
||||
uint32 Phase;
|
||||
@@ -282,10 +282,10 @@ class npc_warden_mellichar : public CreatureScript
|
||||
{
|
||||
npc_warden_mellicharAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
}
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
InstanceScript* pInstance;
|
||||
|
||||
bool IsRunning;
|
||||
bool CanSpawn;
|
||||
|
||||
@@ -70,11 +70,11 @@ class boss_harbinger_skyriss : public CreatureScript
|
||||
{
|
||||
boss_harbinger_skyrissAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
pInstance = pCreature->GetInstanceData();
|
||||
pInstance = pCreature->GetInstanceScript();
|
||||
Intro = false;
|
||||
}
|
||||
|
||||
ScriptedInstance *pInstance;
|
||||
InstanceScript *pInstance;
|
||||
|
||||
bool Intro;
|
||||
bool IsImage33;
|
||||
@@ -272,7 +272,7 @@ class boss_harbinger_skyriss : public CreatureScript
|
||||
}
|
||||
};
|
||||
|
||||
CreatureAI* GetAI_boss_harbinger_skyriss(Creature* pCreature)
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
{
|
||||
return new boss_harbinger_skyrissAI (pCreature);
|
||||
}
|
||||
|
||||
@@ -58,9 +58,9 @@ class instance_arcatraz : public InstanceMapScript
|
||||
: InstanceMapScript("instance_arcatraz")
|
||||
{
|
||||
}
|
||||
struct instance_arcatraz_InstanceMapScript : public ScriptedInstance
|
||||
struct instance_arcatraz_InstanceMapScript : public InstanceScript
|
||||
{
|
||||
instance_arcatraz_InstanceMapScript(Map* pMap) : ScriptedInstance(pMap) { Initialize(); };
|
||||
instance_arcatraz_InstanceMapScript(Map* pMap) : InstanceScript(pMap) { Initialize(); };
|
||||
|
||||
uint32 m_auiEncounter[MAX_ENCOUNTER];
|
||||
|
||||
@@ -229,7 +229,7 @@ class instance_arcatraz : public InstanceMapScript
|
||||
}
|
||||
};
|
||||
|
||||
InstanceData* GetInstanceData(InstanceMap* pMap) const
|
||||
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
|
||||
{
|
||||
return new instance_arcatraz_InstanceMapScript(pMap);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user