[Scummvm-git-logs] scummvm master -> 92601af3d24d7ebade232935ca960cccc87a9071

[Die4Ever]

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:
92601af3d2 GROOVIE: fix T7G modern save/load with farewell, bug #13923


Commit: 92601af3d24d7ebade232935ca960cccc87a9071
    https://github.com/scummvm/scummvm/commit/92601af3d24d7ebade232935ca960cccc87a9071
Author: Die4Ever (die4ever2005 at gmail.com)
Date: 2022-11-23T21:34:54-06:00

Commit Message:
GROOVIE: fix T7G modern save/load with farewell, bug #13923

Changed paths:
    engines/groovie/script.cpp


diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index eb1b651e8c4..04147ef68ae 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -817,7 +817,7 @@ void Script::o_videofromref() {			// 0x09
 		break;
 
 	case 0x2420:	// load from the main menu
-		if (_version == kGroovieT7G && !ConfMan.getBool("originalsaveload")) {
+		if (_version == kGroovieT7G && !ConfMan.getBool("originalsaveload") && _currentInstruction == 381) {
 			GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
 			int slot = dialog->runModalWithCurrentTarget();
 			delete dialog;
@@ -835,7 +835,7 @@ void Script::o_videofromref() {			// 0x09
 		break;
 
 	case 0x2422: // save from the in-game menu
-		if (_version == kGroovieT7G && !ConfMan.getBool("originalsaveload")) {
+		if (_version == kGroovieT7G && !ConfMan.getBool("originalsaveload") && _currentInstruction == 7618) {
 			GUI::MessageDialog saveOrLoad(_("Would you like to save or restore a game?"), _("Save"), _("Restore"));
 
 			int choice = saveOrLoad.runModal();