[Scummvm-git-logs] scummvm branch-3-0 -> c192f74e63c59b5666b7a9019f3aca8dd0619e38

[bluegr]

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

Summary:
5895641e99 ILLUSIONS: Handle invalid object IDs in opStartMoveActorToObject
c192f74e63 TOUCHE: stop any pending speech before closing the underlying streams


Commit: 5895641e991f6dfefee5790e314e944de1d48cda
    https://github.com/scummvm/scummvm/commit/5895641e991f6dfefee5790e314e944de1d48cda
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-11-17T15:13:24+02:00

Commit Message:
ILLUSIONS: Handle invalid object IDs in opStartMoveActorToObject

Fixes bug #12717

Changed paths:
    engines/illusions/duckman/scriptopcodes_duckman.cpp


diff --git a/engines/illusions/duckman/scriptopcodes_duckman.cpp b/engines/illusions/duckman/scriptopcodes_duckman.cpp
index c6e45028dcd..7bf146f0f3d 100644
--- a/engines/illusions/duckman/scriptopcodes_duckman.cpp
+++ b/engines/illusions/duckman/scriptopcodes_duckman.cpp
@@ -499,6 +499,10 @@ void ScriptOpcodes_Duckman::opStartMoveActorToObject(ScriptThread *scriptThread,
 	ARG_UINT32(objectId2);
 	ARG_UINT32(sequenceId);
 	Control *control1 = _vm->_dict->getObjectControl(objectId1);
+	if (!control1) {
+		warning("opStartMoveActorToObject: Control1 not found for objectId: %08X", objectId1);
+		return;
+	}
 	Common::Point pos;
 	if (objectId2 == 0x40003) {
 		pos = _vm->_cursor._position;


Commit: c192f74e63c59b5666b7a9019f3aca8dd0619e38
    https://github.com/scummvm/scummvm/commit/c192f74e63c59b5666b7a9019f3aca8dd0619e38
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-11-17T15:13:24+02:00

Commit Message:
TOUCHE: stop any pending speech before closing the underlying streams

Fixes bug #15515

Changed paths:
    engines/touche/resource.cpp


diff --git a/engines/touche/resource.cpp b/engines/touche/resource.cpp
index a1f33496263..140bfcb5053 100644
--- a/engines/touche/resource.cpp
+++ b/engines/touche/resource.cpp
@@ -82,6 +82,7 @@ void ToucheEngine::res_openDataFile() {
 }
 
 void ToucheEngine::res_closeDataFile() {
+	res_stopSpeech(); // stop any pending speech before closing the underlying streams
 	_fData.close();
 	_fSpeech[0].close();
 	_fSpeech[1].close();