aboutsummaryrefslogtreecommitdiff
path: root/src/game/Creature.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-16 11:48:25 -0600
committermegamage <none@none>2009-03-16 11:48:25 -0600
commit2453f2212324d656676693fd2b420290797a9ebf (patch)
tree3d252d74a5b1cf89d8379c22d90285a3865592c3 /src/game/Creature.cpp
parentfdab13e3c1ebd5f516eabca33fb98972a2d1b4c4 (diff)
parentd6a1516057fdb8261ddee94f97d15a8b4f3de3c7 (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Creature.cpp')
-rw-r--r--src/game/Creature.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index c075a33e92f..7cac1c6a460 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -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;
}