diff options
| author | megamage <none@none> | 2009-01-29 19:35:49 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-29 19:35:49 -0600 |
| commit | b0bf621a139aaa6e620098fc7a4411a800fda43d (patch) | |
| tree | a80cfed503a562c4e436814dc056e8b22386efef /src/game/CreatureAISelector.cpp | |
| parent | 25ab1fa4adfe1e9be1f8bfb6701f6a0d48887770 (diff) | |
| parent | adee7cab17e191ab9d735c326cd611f0380736d6 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/CreatureAISelector.cpp')
| -rw-r--r-- | src/game/CreatureAISelector.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/CreatureAISelector.cpp b/src/game/CreatureAISelector.cpp index 9927ff34df3..9e53fe0f641 100644 --- a/src/game/CreatureAISelector.cpp +++ b/src/game/CreatureAISelector.cpp @@ -65,6 +65,8 @@ namespace FactorySelector ai_factory = ai_registry.GetRegistryItem("TotemAI"); else if(creature->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER) ai_factory = ai_registry.GetRegistryItem("NullCreatureAI"); + else if(creature->GetCreatureType() == CREATURE_TYPE_CRITTER) + ai_factory = ai_registry.GetRegistryItem("CritterAI"); } // select by permit check @@ -91,7 +93,7 @@ namespace FactorySelector ainame = (ai_factory == NULL) ? "NullCreatureAI" : ai_factory->key(); DEBUG_LOG("Creature %u used AI is %s.", creature->GetGUIDLow(), ainame.c_str() ); - return ( ai_factory == NULL ? new NullCreatureAI : ai_factory->Create(creature) ); + return ( ai_factory == NULL ? new NullCreatureAI(creature) : ai_factory->Create(creature) ); } MovementGenerator* selectMovementGenerator(Creature *creature) |