[Scummvm-git-logs] scummvm branch-2-9 -> 181be3a0f6a19b1ed1596020b712e185faeba1a5

AndywinXp noreply at scummvm.org
Sat Dec 28 11:14:04 UTC 2024


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:
181be3a0f6 SCUMM: COMI: Fix file being opened and not closed


Commit: 181be3a0f6a19b1ed1596020b712e185faeba1a5
    https://github.com/scummvm/scummvm/commit/181be3a0f6a19b1ed1596020b712e185faeba1a5
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-12-28T12:13:57+01:00

Commit Message:
SCUMM: COMI: Fix file being opened and not closed

This fixes #15633:
"SCUMM: COMI: Saving over an existing save loads that save instead"

...whoops.

This also raises the debug level of a related print which caused
noise on the debug log.

Changed paths:
    engines/scumm/saveload.cpp
    engines/scumm/script_v8.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 487b7cd6270..a9f4763d5a9 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -311,6 +311,8 @@ void ScummEngine::copyHeapSaveGameToFile(int slot, const char *saveName) {
 		delete saveFile;
 	}
 
+	delete heapSaveFile;
+
 	if (saveFailed)
 		debug(1, "State save as '%s' FAILED", fileName.c_str());
 	else
diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp
index 2e45d477331..49f7a14b2de 100644
--- a/engines/scumm/script_v8.cpp
+++ b/engines/scumm/script_v8.cpp
@@ -1149,7 +1149,7 @@ void ScummEngine_v8::o8_kernelSetFunctions() {
 		_saveTemporaryState = false;
 		break;
 	case 28:	// stampShotEnqueue
-		debug(0, "o8_kernelSetFunctions: stampShotEnqueue(%d, %d, %d, %d, %d, %d)", args[1], args[2], args[3], args[4], args[5], args[6]);
+		debug(8, "o8_kernelSetFunctions: stampShotEnqueue(%d, %d, %d, %d, %d, %d)", args[1], args[2], args[3], args[4], args[5], args[6]);
 		stampShotEnqueue(args[1], args[2], args[3], args[4], args[5], args[6]);
 		break;
 	case 29:	// setKeyScript




More information about the Scummvm-git-logs mailing list