[Scummvm-git-logs] scummvm master -> 1e87385d94ddfa2eda6bb750ba3c476527dc534b

[sev-]

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:
a7b041dbc8 SLUDGE: Look inside game data directory in CustomSaveHelper::fileToStack()
1e87385d94 SLUDGE: OTTO: Fix crash when loading original otto.ini file


Commit: a7b041dbc826849ed7a2218dc39778985d5ab108
    https://github.com/scummvm/scummvm/commit/a7b041dbc826849ed7a2218dc39778985d5ab108
Author: Alikhan Balpykov (luxrage1990 at gmail.com)
Date: 2025-08-22T22:38:25+02:00

Commit Message:
SLUDGE: Look inside game data directory in CustomSaveHelper::fileToStack()

Changed paths:
    engines/sludge/savedata.cpp


diff --git a/engines/sludge/savedata.cpp b/engines/sludge/savedata.cpp
index 520ff3e6efb..38fe5b863df 100644
--- a/engines/sludge/savedata.cpp
+++ b/engines/sludge/savedata.cpp
@@ -19,6 +19,7 @@
  *
  */
 
+#include "common/file.h"
 #include "common/savefile.h"
 #include "common/system.h"
 
@@ -101,7 +102,12 @@ bool CustomSaveHelper::fileToStack(const Common::String &filename, StackHandler
 	Common::InSaveFile *fp = g_system->getSavefileManager()->openForLoading(filename);
 
 	if (fp == NULL) {
-		return fatal("No such file", filename); //TODO: false value
+		// Try looking inside game folder
+		delete fp;
+		Common::File *f = new Common::File();
+		if (!f->open(Common::Path(filename)))
+			return fatal("No such file", filename); //TODO: false value
+		fp = f;
 	}
 
 	_encode1 = (byte)_saveEncoding & 255;


Commit: 1e87385d94ddfa2eda6bb750ba3c476527dc534b
    https://github.com/scummvm/scummvm/commit/1e87385d94ddfa2eda6bb750ba3c476527dc534b
Author: Alikhan Balpykov (luxrage1990 at gmail.com)
Date: 2025-08-22T22:38:25+02:00

Commit Message:
SLUDGE: OTTO: Fix crash when loading original otto.ini file

Changed paths:
    engines/sludge/savedata.cpp


diff --git a/engines/sludge/savedata.cpp b/engines/sludge/savedata.cpp
index 38fe5b863df..547041995ff 100644
--- a/engines/sludge/savedata.cpp
+++ b/engines/sludge/savedata.cpp
@@ -23,6 +23,7 @@
 #include "common/savefile.h"
 #include "common/system.h"
 
+#include "sludge/sludge.h"
 #include "sludge/newfatal.h"
 #include "sludge/savedata.h"
 #include "sludge/variable.h"
@@ -108,6 +109,15 @@ bool CustomSaveHelper::fileToStack(const Common::String &filename, StackHandler
 		if (!f->open(Common::Path(filename)))
 			return fatal("No such file", filename); //TODO: false value
 		fp = f;
+
+		// WORKAROUND: For Otto Experiment, when looking for the otto.ini
+		// for the first time, include CRLF line ending to checker for both encoded and ASCII
+		// data. This is needed since the original otto.ini that comes with the installer
+		// have CRLF line ending.
+		Common::String gameId = g_sludge->getGameId();
+		if (gameId == "otto") {
+			checker = _saveEncoding ? "[Custom data (encoded)]\r\n" : "[Custom data (ASCII)]\r\n";
+		}
 	}
 
 	_encode1 = (byte)_saveEncoding & 255;