feat(Core/Instance): Add instance validation for creature scripts (#4596)

This commit is contained in:
Kitzunu
2021-04-05 15:34:26 +02:00
committed by GitHub
parent 60f865fce6
commit f9d708b450
371 changed files with 1315 additions and 767 deletions

View File

@@ -83,7 +83,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_drakkari_colossusAI (creature);
return GetGundrakAI<boss_drakkari_colossusAI>(creature);
}
struct boss_drakkari_colossusAI : public BossAI
{
@@ -233,7 +233,7 @@ public:
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_drakkari_elementalAI (pCreature);
return GetGundrakAI<boss_drakkari_elementalAI>(pCreature);
}
struct boss_drakkari_elementalAI : public ScriptedAI
@@ -313,7 +313,7 @@ public:
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_living_mojoAI (pCreature);
return GetGundrakAI<npc_living_mojoAI>(pCreature);
}
struct npc_living_mojoAI : public ScriptedAI

View File

@@ -32,7 +32,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_eckAI>(creature);
return GetGundrakAI<boss_eckAI>(creature);
}
struct boss_eckAI : public BossAI

View File

@@ -50,7 +50,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_gal_darahAI>(creature);
return GetGundrakAI<boss_gal_darahAI>(creature);
}
struct boss_gal_darahAI : public BossAI

View File

@@ -50,7 +50,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_moorabiAI>(creature);
return GetGundrakAI<boss_moorabiAI>(creature);
}
struct boss_moorabiAI : public BossAI

View File

@@ -61,7 +61,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_slad_ranAI(creature);
return GetGundrakAI<boss_slad_ranAI>(creature);
}
struct boss_slad_ranAI : public BossAI

View File

@@ -6,6 +6,9 @@
#define DEF_GUNDRAK_H
#include "SpellScript.h"
#include "CreatureAIImpl.h"
#define GundrakScriptName "instance_gundrak"
enum Data
{
@@ -43,4 +46,10 @@ enum GameObjects
GO_GAL_DARAH_DOORS2 = 193209
};
template <class AI, class T>
inline AI* GetGundrakAI(T* obj)
{
return GetInstanceAI<AI>(obj, GundrakScriptName);
}
#endif