diff options
| author | megamage <none@none> | 2009-08-26 22:56:20 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-08-26 22:56:20 -0500 |
| commit | f16b93d8d8ded579fbf7b560afa3bb6475816c02 (patch) | |
| tree | f3320916aa1ddc55d0aa49130fa6e11f3f5a791b /src/game | |
| parent | c5ff737ef8e9c1805505df8429d98a9fed839895 (diff) | |
*Update flame levi script. Fix the bug that it often gets stuck.
--HG--
branch : trunk
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/Creature.cpp | 3 | ||||
| -rw-r--r-- | src/game/ObjectMgr.cpp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 5441a42c94a..3e857a34acc 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -562,6 +562,8 @@ void Creature::Update(uint32 diff) break; } case DEAD_FALLING: + GetMotionMaster()->UpdateMotion(diff); + break; default: break; } @@ -1817,6 +1819,7 @@ bool Creature::FallGround() if (fabs(ground_Z - z) < 0.1f) return false; + RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); GetMotionMaster()->MovePoint(EVENT_FALL_GROUND, x, y, ground_Z); Unit::setDeathState(DEAD_FALLING); return true; diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 2acad8f7ede..8d00b604236 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -1034,8 +1034,9 @@ uint32 ObjectMgr::ChooseDisplayId(uint32 team, const CreatureInfo *cinfo, const case 33114: // Flame Leviathan Seat (model 24914 chair) case 33167: // Salvaged Demolisher Mechanic Seat return cinfo->DisplayID_A[0]; - case 33143: // Overload Control Device case 33218: // Pyrite Safety Container + return cinfo->DisplayID_A[1]; + case 33143: // Overload Control Device return cinfo->DisplayID_H[0]; default: return cinfo->GetRandomValidModelId(); |