[Scummvm-cvs-logs] scummvm master -> dedbfb836a77f466bd95f45138a337a47060c5cc
sylvaintv
sylvaintv at gmail.com
Fri Oct 7 01:17:58 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
dedbfb836a TOON: Fix Flux jumpy animation when imprisoned
Commit: dedbfb836a77f466bd95f45138a337a47060c5cc
https://github.com/scummvm/scummvm/commit/dedbfb836a77f466bd95f45138a337a47060c5cc
Author: sylvaintv (sylvaintv at gmail.com)
Date: 2011-10-06T16:10:51-07:00
Commit Message:
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
Changed paths:
engines/toon/script_func.cpp
engines/toon/toon.cpp
diff --git a/engines/toon/script_func.cpp b/engines/toon/script_func.cpp
index b6a374a..e9b7534 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 4631e5f..b3ab591 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) {
More information about the Scummvm-git-logs
mailing list