diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-23 19:23:17 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-23 19:23:17 +0100 |
| commit | b61bf8f01f6ec9298df6b94eb31cadbde72c4b57 (patch) | |
| tree | bff89cba8127f8a353b9bed8b700acaf4c1f064f /src/server/scripts/EasternKingdoms | |
| parent | f1e1a5cad0fb32fea2aebdc864eb72005594c60c (diff) | |
| parent | f731116766268a38a58572e57cc8abbac400c5ca (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h index 7543a1bb597..5fbd18b7590 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h +++ b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h @@ -88,13 +88,9 @@ enum GameObjectIds }; template<class AI> -CreatureAI* GetZulGurubAI(Creature* creature) +AI* GetZulGurubAI(Creature* creature) { - if (InstanceMap* instance = creature->GetMap()->ToInstanceMap()) - if (instance->GetInstanceScript()) - if (instance->GetScriptId() == sObjectMgr->GetScriptId(ZGScriptName)) - return new AI(creature); - return NULL; + return GetInstanceAI<AI>(creature, ZGScriptName); } #endif |