[7666] For heroic mode creature use AIName from normal mode version in same way as done for ScriptName. Author: VladimirMangos

    Also at creature templates loading check that AIName/ScriptName not set for heroic mode creature versions.

--HG--
branch : trunk

1 files changed, 2 insertions, 5 deletions

diff --git a/src/game/CreatureAISelector.cpp b/src/game/CreatureAISelector.cpp
index 88384fd6f21..9250a254155 100644
--- a/src/game/CreatureAISelector.cpp
+++ b/src/game/CreatureAISelector.cpp
@@ -47,11 +47,8 @@ namespace FactorySelector
             if(CreatureAI* scriptedAI = Script->GetAI(creature))
                 return scriptedAI;
 
-        CreatureInfo const *cinfo = creature->GetCreatureInfo();
-        assert(cinfo);
-
-        // this seems to be useless
-        std::string ainame=cinfo->AIName;
+        // AIname in db
+        std::string ainame=creature->GetAIName();
         if(!ai_factory && !ainame.empty())
             ai_factory = ai_registry.GetRegistryItem( ainame.c_str() );