[Scummvm-git-logs] scummvm master -> 06e67f1b0757abfb9c1e6a32686ffae056ad9b2c

[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:
06e67f1b07 GROOVIE: Clandestiny modern load menu WIP


Commit: 06e67f1b0757abfb9c1e6a32686ffae056ad9b2c
    https://github.com/scummvm/scummvm/commit/06e67f1b0757abfb9c1e6a32686ffae056ad9b2c
Author: Die4Ever (die4ever2005 at gmail.com)
Date: 2022-02-15T23:41:26-06:00

Commit Message:
GROOVIE: Clandestiny modern load menu WIP

Changed paths:
    engines/groovie/script.cpp


diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 7190d4498d7..b5eca39578b 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -2191,11 +2191,6 @@ 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);
@@ -2234,7 +2229,24 @@ void Script::o2_vdxtransition() {
 			}
 
 			_currentInstruction = 0x162; // end of save_cam.grv
+			return;
+		}
+		// TODO: modern load menu needs to tell the user that slot 0 is for starting a new game
+#if 0
+		else if (_currentInstruction == 0xA12C && _scriptFile == "clanmain.grv") {
+			// Load from the main menu
+			GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+			int slot = dialog->runModalWithCurrentTarget();
+			delete dialog;
+
+			if (slot >= 0) {
+				directGameLoad(slot);
+			} else {
+				_currentInstruction = 0xA730;
+			}
+			return;
 		}
+#endif
 	}
 
 	// Set bit 1