[Scummvm-git-logs] scummvm master -> 15957c38a71f0dbbf62d780a6182dd799649f8cc

[aquadran]

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:
15957c38a7 GRIM: Put warning message for user after restore from save game. Related with bug #13139 and #14987


Commit: 15957c38a71f0dbbf62d780a6182dd799649f8cc
    https://github.com/scummvm/scummvm/commit/15957c38a71f0dbbf62d780a6182dd799649f8cc
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-14T17:50:10+02:00

Commit Message:
GRIM: Put warning message for user after restore from save game. Related with bug #13139 and #14987

Changed paths:
    engines/grim/grim.cpp


diff --git a/engines/grim/grim.cpp b/engines/grim/grim.cpp
index ee82206dcf8..366b6aaa3ba 100644
--- a/engines/grim/grim.cpp
+++ b/engines/grim/grim.cpp
@@ -1263,8 +1263,6 @@ void GrimEngine::savegameRestore() {
 	lua_Restore(_savedState);
 	Debug::debug(Debug::Engine, "Lua restored successfully.");
 
-	delete _savedState;
-
 	_justSaveLoaded = true;
 
 	//Re-read the values, since we may have been in some state that changed them when loading the savegame,
@@ -1277,8 +1275,16 @@ void GrimEngine::savegameRestore() {
 	if (g_imuse)
 		g_imuse->pause(false);
 	g_movie->pause(false);
+
 	debug(2, "GrimEngine::savegameRestore() finished.");
 
+	// Related to bug #13139 and #14987
+	if (getGameType() == GType_GRIM && !(getGameFlags() & ADGF_DEMO) && _savedState->saveMajorVersion() == SaveGame::SAVEGAME_MAJOR_VERSION && _savedState->saveMinorVersion() <= 28) {
+		GUI::displayErrorDialog(Common::U32String::format(_("The game save file may be invalid and prevent game to be completed.")));
+	}
+
+	delete _savedState;
+
 	_shortFrame = true;
 	clearEventQueue();
 	invalidateActiveActorsList();