diff options
| author | sylvaintv | 2011-10-07 01:10:51 +0200 |
|---|---|---|
| committer | sylvaintv | 2011-10-07 01:10:51 +0200 |
| commit | dedbfb836a77f466bd95f45138a337a47060c5cc (patch) | |
| tree | ad37ba30be80c4f26ee3d1519008580a265bbf8b | |
| parent | 164604805e00d8b17d0725f605575c7ec8741001 (diff) | |
| download | scummvm-rg350-dedbfb836a77f466bd95f45138a337a47060c5cc.tar.gz scummvm-rg350-dedbfb836a77f466bd95f45138a337a47060c5cc.tar.bz2 scummvm-rg350-dedbfb836a77f466bd95f45138a337a47060c5cc.zip | |
TOON: Fix Flux jumpy animation when imprisoned
Idle animation was reset every frame when changing facing point.
Fix also Drew description when right-clicking on Flux
| -rw-r--r-- | engines/toon/script_func.cpp | 6 | ||||
| -rw-r--r-- | engines/toon/toon.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/engines/toon/script_func.cpp b/engines/toon/script_func.cpp index b6a374ab5c..e9b7534198 100644 --- a/engines/toon/script_func.cpp +++ b/engines/toon/script_func.cpp @@ -655,13 +655,15 @@ int32 ScriptFunc::sys_Cmd_Set_Flux_Facing_Point(EMCState *state) { int32 fx = stackPos(0); int32 fy = stackPos(1); _vm->getFlux()->setFacing(_vm->getFlux()->getFacingFromDirection(fx - _vm->getFlux()->getX(), fy - _vm->getFlux()->getY())); - _vm->getFlux()->playStandingAnim(); + if (_vm->getFlux()->getFlag() == 0) // don't reset the animation unless Flux is in idle mode + _vm->getFlux()->playStandingAnim(); return 1; } int32 ScriptFunc::sys_Cmd_Set_Flux_Facing(EMCState *state) { _vm->getFlux()->forceFacing(stackPos(0)); - _vm->getFlux()->playStandingAnim(); + if (_vm->getFlux()->getFlag() == 0) // don't reset the animation unless Flux is in idle mode + _vm->getFlux()->playStandingAnim(); return 0; } diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp index 4631e5f0d0..b3ab591ba7 100644 --- a/engines/toon/toon.cpp +++ b/engines/toon/toon.cpp @@ -1503,7 +1503,7 @@ void ToonEngine::clickEvent() { if (leftButton) createMouseItem(104); else - characterTalk(518); + characterTalk(1104); } } if (_currentHotspotItem == -4) { |