[Scummvm-git-logs] scummvm master -> 8accd69981ee30994787b4553b599f4030195b6c

[sdelamarre]

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:
8accd69981 GOB: fix an error message in Adibou1 CD when completing the sweets collection


Commit: 8accd69981ee30994787b4553b599f4030195b6c
    https://github.com/scummvm/scummvm/commit/8accd69981ee30994787b4553b599f4030195b6c
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2023-07-14T22:15:30+02:00

Commit Message:
GOB: fix an error message in Adibou1 CD when completing the sweets collection

The game tries to make a copy of the savegame on a floppy that is meant to be sent to Coktel Vision, just ignore it.

Changed paths:
    engines/gob/save/saveload_adibou1.cpp


diff --git a/engines/gob/save/saveload_adibou1.cpp b/engines/gob/save/saveload_adibou1.cpp
index 44144c5f965..8c331c57e05 100644
--- a/engines/gob/save/saveload_adibou1.cpp
+++ b/engines/gob/save/saveload_adibou1.cpp
@@ -38,7 +38,10 @@ SaveLoad_Adibou1::SaveFile SaveLoad_Adibou1::_saveFiles[] = {
 	{ "dessin5.inf", kSaveModeSave, nullptr, "paint game drawing"},
 	{ "dessin6.inf", kSaveModeSave, nullptr, "paint game drawing"},
 	{ "dessin7.inf", kSaveModeSave, nullptr, "paint game drawing"},
-	{ "dessin8.inf", kSaveModeSave, nullptr, "paint game drawing"}
+	{ "dessin8.inf", kSaveModeSave, nullptr, "paint game drawing"},
+	{ "a:\\bou.inf", kSaveModeIgnore, nullptr, "copy of the savegame to be sent "
+											   "to Coktel Vision on a floppy"
+											   "when completing the game"},
 };
 
 SaveLoad_Adibou1::SaveLoad_Adibou1(GobEngine *vm, const char *targetName) :
@@ -237,6 +240,13 @@ bool SaveLoad_Adibou1::GameFileHandler::load(int16 dataVar, int32 size, int32 of
 	if (fileName.empty())
 		return false;
 
+	if (size < 0) {
+		// Hack in original game, using a bitmap memory as a temporary buffer to make
+		// a copy the savegame. We do not need this copy, so we can just ignore it.
+		debugC(1, kDebugSaveLoad, "Ignoring bou.inf save with negative size");
+		return true;
+	}
+
 	if (size == 0) {
 		uint32 varSize = SaveHandler::getVarSize(_vm);
 		// Indicator to load all variables