libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-07 01:01:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

TOON: Fix Flux jumpy animation when imprisoned

Browse Source 
Idle animation was reset every frame when changing facing point.
Fix also Drew description when right-clicking on Flux
This commit is contained in:
sylvaintv 2011-10-07 01:10:51 +02:00
parent 164604805e
commit dedbfb836a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/toon/script_func.cpp
View File

@ -655,13 +655,15 @@ int32 ScriptFunc::sys_Cmd_Set_Flux_Facing_Point(EMCState *state) {
int32 fx = stackPos(0); int32 fx = stackPos(0);
int32 fy = stackPos(1); int32 fy = stackPos(1);
_vm->getFlux()->setFacing(_vm->getFlux()->getFacingFromDirection(fx - _vm->getFlux()->getX(), fy - _vm->getFlux()->getY())); _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; return 1;
} }
int32 ScriptFunc::sys_Cmd_Set_Flux_Facing(EMCState *state) { int32 ScriptFunc::sys_Cmd_Set_Flux_Facing(EMCState *state) {
_vm->getFlux()->forceFacing(stackPos(0)); _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; return 0;
} }

2
engines/toon/toon.cpp
View File

@ -1503,7 +1503,7 @@ void ToonEngine::clickEvent() {
if (leftButton) if (leftButton)
createMouseItem(104); createMouseItem(104);
else else
characterTalk(518); characterTalk(1104);
} }
} }
if (_currentHotspotItem == -4) { if (_currentHotspotItem == -4) {