*Merge.

--HG-- branch : trunk
2009-03-16 11:48:25 -06:00
parent fdab13e3c1 d6a1516057
commit 2453f22123
9 changed files with 19 additions and 155 deletions
@@ -598,8 +598,8 @@ bool Creature::AIM_Initialize(CreatureAI* ai)
    }

    if(i_AI) delete i_AI;
-    i_AI = ai ? ai : FactorySelector::selectAI(this);
    i_motionMaster.Initialize();
+    i_AI = ai ? ai : FactorySelector::selectAI(this);
    IsAIEnabled = true;
    return true;
 }