[Scummvm-git-logs] scummvm master -> 1368db9f9f9c7a143d4b13db6691e7362407c3cf

[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:
1368db9f9f GROOVIE: Clandestiny add modern save menu


Commit: 1368db9f9f9c7a143d4b13db6691e7362407c3cf
    https://github.com/scummvm/scummvm/commit/1368db9f9f9c7a143d4b13db6691e7362407c3cf
Author: Die4Ever (die4ever2005 at gmail.com)
Date: 2022-02-15T20:26:04-06:00

Commit Message:
GROOVIE: Clandestiny add modern save menu

Changed paths:
    engines/groovie/detection.cpp
    engines/groovie/script.cpp


diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp
index 0f48902ec14..125d4ff1476 100644
--- a/engines/groovie/detection.cpp
+++ b/engines/groovie/detection.cpp
@@ -332,7 +332,7 @@ static const GroovieGameDescription gameDescriptions[] = {
 			AD_ENTRY2s("clanmain.grv", "dd424120fa1daa9d6b576d0ba22a4936", 54253,
 						"ACT01MUS.MPG", nullptr, -1),
 			Common::EN_ANY, Common::kPlatformWindows, ADGF_TESTING,
-			GUIO3(GUIO_NOMIDI, GUIO_NOASPECT, GAMEOPTION_EASIER_AI)
+			GUIO4(GUIO_NOMIDI, GUIO_NOASPECT, GAMEOPTION_EASIER_AI, GAMEOPTION_ORIGINAL_SAVELOAD)
 		},
 		kGroovieCDY
 	},
@@ -344,7 +344,7 @@ static const GroovieGameDescription gameDescriptions[] = {
             AD_ENTRY2s("CLANMAIN.GRV", "dd424120fa1daa9d6b576d0ba22a4936", 54253,
                        "ACT01MUS.m4a", nullptr, -1),
             Common::EN_ANY, Common::kPlatformUnknown, ADGF_TESTING,
-            GUIO3(GUIO_NOMIDI, GUIO_NOASPECT, GAMEOPTION_EASIER_AI)
+            GUIO4(GUIO_NOMIDI, GUIO_NOASPECT, GAMEOPTION_EASIER_AI, GAMEOPTION_ORIGINAL_SAVELOAD)
         },
         kGroovieCDY
     },
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index b84cac0c28a..4df31176672 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -2161,7 +2161,7 @@ void Script::o2_videofromref() {
 		_videoSkipAddress = 1417;
 
 	if (_version == kGroovieT11H && fileref != _videoRef && !ConfMan.getBool("originalsaveload")) {
-		if (_currentInstruction == 0xE50A) {
+		if (_currentInstruction == 0xE50A && _scriptFile == "script.grv") {
 			// Load from the main menu
 			GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
 			int slot = dialog->runModalWithCurrentTarget();
@@ -2174,7 +2174,7 @@ void Script::o2_videofromref() {
 			} else {
 				_currentInstruction = 0xBF37; // main menu
 			}
-		} else if (_currentInstruction == 0xE955) {
+		} else if (_currentInstruction == 0xE955 && _scriptFile == "script.grv") {
 			// Save from the main menu
 			GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
 			int slot = dialog->runModalWithCurrentTarget();
@@ -2189,6 +2189,11 @@ void Script::o2_videofromref() {
 		}
 	}
 
+	if (_version == kGroovieCDY && fileref != _videoRef && !ConfMan.getBool("originalsaveload")) {
+		if (_currentInstruction == 0xE50A && _scriptFile == "save_cam.grv") {
+		}
+	}
+
 	// Show the debug information just when starting the playback
 	if (fileref != _videoRef) {
 		debugC(1, kDebugScript, "Groovie::Script: VIDEOFROMREF(0x%08X) (Not fully imp): Play video file from ref", fileref);
@@ -2214,6 +2219,22 @@ void Script::o2_vdxtransition() {
 		debugC(2, kDebugVideo, "\nGroovie::Script: @0x%04X: Playing video %d with transition via 0x1C (o2_vdxtransition)", _currentInstruction-5, fileref);
 	}
 
+	if (_version == kGroovieCDY && fileref != _videoRef && !ConfMan.getBool("originalsaveload")) {
+		if (_currentInstruction == 0x59 && _scriptFile == "save_cam.grv") {
+			// Save from the main menu
+			GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+			int slot = dialog->runModalWithCurrentTarget();
+			Common::String saveName = dialog->getResultString();
+			delete dialog;
+
+			if (slot >= 0) {
+				directGameSave(slot, saveName);
+			}
+
+			_currentInstruction = 0x162; // end of save_cam.grv
+		}
+	}
+
 	// Set bit 1
 	_bitflags |= 1 << 1;