[Scummvm-git-logs] scummvm master -> 6ab5f889d415d138c22c06187e7f24fe3677bf60

[sev-]

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:
6ab5f889d4 COMPOSER: Fix savesate name generation when run from scripts. Bug #11022


Commit: 6ab5f889d415d138c22c06187e7f24fe3677bf60
    https://github.com/scummvm/scummvm/commit/6ab5f889d415d138c22c06187e7f24fe3677bf60
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-15T14:32:19+01:00

Commit Message:
COMPOSER: Fix savesate name generation when run from scripts. Bug #11022

Changed paths:
    engines/composer/scripting.cpp


diff --git a/engines/composer/scripting.cpp b/engines/composer/scripting.cpp
index 36db4308f81..ff78def45e1 100644
--- a/engines/composer/scripting.cpp
+++ b/engines/composer/scripting.cpp
@@ -600,7 +600,7 @@ int16 ComposerEngine::scriptFuncCall(uint16 id, int16 param1, int16 param2, int1
 	case kFuncSaveVars:
 		debug(3, "kFuncSaveVars(%d)", param1);
 		{
-		Common::String filename = _targetName + Common::String::format(".%03d", param1);
+		Common::String filename = getSaveStateName(param1);
 		Common::WriteStream *stream = _saveFileMan->openForSaving(filename);
 		for (uint i = 0; i < 1000; i++) {
 			stream->writeUint16LE(_vars[i]);
@@ -611,7 +611,7 @@ int16 ComposerEngine::scriptFuncCall(uint16 id, int16 param1, int16 param2, int1
 	case kFuncLoadVars:
 		debug(3, "kFuncLoadVars(%d, %d, %d)", param1, param2, param3);
 		{
-		Common::String filename = _targetName + Common::String::format(".%03d", param1);
+		Common::String filename = getSaveStateName(param1);
 		Common::SeekableReadStream *stream = _saveFileMan->openForLoading(filename);
 		if (!stream) {
 			if (!_bookIni.hasKey(Common::String::format("%d", param1), "Data"))