diff options
| author | XTZGZoReX <none@none> | 2009-04-07 12:24:41 +0200 |
|---|---|---|
| committer | XTZGZoReX <none@none> | 2009-04-07 12:24:41 +0200 |
| commit | 65200e103984ba76b6c3fc13ad1c2776f19a7ab7 (patch) | |
| tree | 4c23770b8504ef1a4cf3c1a0d8bbb59a96877fff /src/game/Creature.cpp | |
| parent | af2d4f039bd3dc87e8112adf1d8af0744e6ac11d (diff) | |
| parent | 2fe9fed7c71697af06b981e221ea54acb62abb6b (diff) | |
* Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Creature.cpp')
| -rw-r--r-- | src/game/Creature.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 837a45942ab..74ebe4406c8 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -623,14 +623,14 @@ bool Creature::AIM_Initialize(CreatureAI* ai) void Creature::Motion_Initialize() { - if(!m_formation) - i_motionMaster.Initialize(); - else if(m_formation->getLeader() == this) - { - m_formation->FormationReset(false); - i_motionMaster.Initialize(); - } - else if(m_formation->isFormed()) + if(!m_formation) + i_motionMaster.Initialize(); + else if(m_formation->getLeader() == this) + { + m_formation->FormationReset(false); + i_motionMaster.Initialize(); + } + else if(m_formation->isFormed()) i_motionMaster.MoveIdle(MOTION_SLOT_IDLE); //wait the order of leader else i_motionMaster.Initialize(); @@ -1672,10 +1672,10 @@ void Creature::setDeathState(DeathState s) Unit::setDeathState(CORPSE); - //Dismiss group if is leader - if(m_formation && m_formation->getLeader() == this) - m_formation->FormationReset(true); - } + //Dismiss group if is leader + if(m_formation && m_formation->getLeader() == this) + m_formation->FormationReset(true); + } if(s == JUST_ALIVED) { //if(isPet()) @@ -1691,7 +1691,7 @@ void Creature::setDeathState(DeathState s) SetMeleeDamageSchool(SpellSchools(cinfo->dmgschool)); LoadCreaturesAddon(true); Motion_Initialize(); - } + } } bool Creature::FallGround() |