diff options
| author | gvcoman <none@none> | 2008-11-05 20:51:05 -0600 |
|---|---|---|
| committer | gvcoman <none@none> | 2008-11-05 20:51:05 -0600 |
| commit | 44bdb135f4ed5bb834795cfb928ccbb0504cf834 (patch) | |
| tree | 7995df4957fb2e0e6cde895fbe3e85b7efde5fa7 /src/game/CreatureAISelector.cpp | |
| parent | 8d331f2b10cff29ee0571f7056ad353df6a3eabd (diff) | |
[svn] Implemented player on player and player on creature possession:
* Implemented packet and vision forwarding through possessed units
* Added new OnPossess script call alerting scripts on when possession is applied/removed
* Moved fall damage and fall under map calculations into the Player class
* Added new PossessedAI that is applied only while possession on creature is active
* Implemented summon possessed spell effect
* Fixed Eyes of the Beast
--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 575dabca430..2e0d297305c 100644 --- a/src/game/CreatureAISelector.cpp +++ b/src/game/CreatureAISelector.cpp @@ -56,12 +56,14 @@ namespace FactorySelector { if( creature->isGuard() ) ai_factory = ai_registry.GetRegistryItem("GuardAI"); - else if(creature->isPet() || creature->isCharmed()) + else if(creature->isPet() || (creature->isCharmed() && !creature->isPossessed())) ai_factory = ai_registry.GetRegistryItem("PetAI"); else if(creature->isTotem()) 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->isPossessed()) + creature->InitPossessedAI(); } // select by permit check |