[Scummvm-git-logs] scummvm master -> 804a51110e6ddab6735f078d0bdf7d7bc3810ffe

[scemino]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a649dc1fc5 TWP: Fix "Skip Text" not bound to period (bug #15085)
804a51110e TWP: Fix animation still playing even when skipping text (bug #15084)


Commit: a649dc1fc55321f02d7ea8c08c1f985c92997158
    https://github.com/scummvm/scummvm/commit/a649dc1fc55321f02d7ea8c08c1f985c92997158
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-20T22:42:39+02:00

Commit Message:
TWP: Fix "Skip Text" not bound to period (bug #15085)

Changed paths:
    engines/twp/metaengine.cpp


diff --git a/engines/twp/metaengine.cpp b/engines/twp/metaengine.cpp
index 819e8d3761e..2a71951ff39 100644
--- a/engines/twp/metaengine.cpp
+++ b/engines/twp/metaengine.cpp
@@ -150,7 +150,7 @@ Common::Array<Common::Keymap *> TwpMetaEngine::initKeymaps(const char *target) c
 		{"SELECTCHOICE6", _s("Select Choice 6"), Twp::kSelectChoice6, "6"},
 		{"SELECTNEXTACTOR", _s("Select Next Actor"), Twp::kSelectNextActor, "0"},
 		{"SELECTPREVACTOR", _s("Select Previous Actor"), Twp::kSelectPreviousActor, "9"},
-		{"SKIPTEXT", _s("Skip Text"), Twp::kSkipText, "."},
+		{"SKIPTEXT", _s("Skip Text"), Twp::kSkipText, "PERIOD"},
 		{"SHOWHOTSPOTS", _s("Show hotspots"), Twp::kShowHotspots, "TAB"},
 		{0, 0, Twp::kSkipCutscene, 0},
 	};


Commit: 804a51110e6ddab6735f078d0bdf7d7bc3810ffe
    https://github.com/scummvm/scummvm/commit/804a51110e6ddab6735f078d0bdf7d7bc3810ffe
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-20T22:42:39+02:00

Commit Message:
TWP: Fix animation still playing even when skipping text (bug #15084)

Changed paths:
    engines/twp/motor.cpp


diff --git a/engines/twp/motor.cpp b/engines/twp/motor.cpp
index eb564a3a0ff..6b257a07895 100644
--- a/engines/twp/motor.cpp
+++ b/engines/twp/motor.cpp
@@ -514,6 +514,8 @@ void Talking::disable() {
 	_obj->setHeadIndex(1);
 	if (_node)
 		_node->remove();
+	_elapsed = 0.f;
+	_duration = 0.f;
 }
 
 int Talking::onTalkieId(int id) {