From 0540f7cf5c0fb4d2f113582c23ccc87c819949ca Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Sun, 10 Jul 2022 20:13:58 +0200 Subject: [PATCH] TWINE: Pressing W to talk to people in sporty mode also makes you jump ... after the interaction finishes see https://bugs.scummvm.org/ticket/13676 --- engines/twine/script/script_life_v1.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/engines/twine/script/script_life_v1.cpp b/engines/twine/script/script_life_v1.cpp index 840b25063d5..388a72b3ed0 100644 --- a/engines/twine/script/script_life_v1.cpp +++ b/engines/twine/script/script_life_v1.cpp @@ -733,6 +733,13 @@ static int32 lMESSAGE(TwinEEngine *engine, LifeScriptContext &ctx) { } engine->_text->setFontCrossColor(ctx.actor->_talkColor); engine->_scene->_talkingActor = ctx.actorIdx; + + // if we are in sporty mode, we might have triggered a jump with the special action binding + // see https://bugs.scummvm.org/ticket/13676 for more details. + if (ctx.actor->isJumpAnimationActive()) { + engine->_animations->initAnim(AnimationTypes::kStanding, AnimType::kAnimationTypeLoop, AnimationTypes::kAnimInvalid, OWN_ACTOR_SCENE_INDEX); + } + engine->_text->drawTextProgressive(textIdx); if (engine->_scene->_currentSceneIdx == LBA1SceneId::Principal_Island_Library && engine->_scene->_talkingActor == 8 && textIdx == TextId::kStarWarsFanBoy) { engine->unlockAchievement("LBA_ACH_008");