[Scummvm-git-logs] scummvm master -> c97f524b77fc29553773518ffb1f7217a7247acd

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cbc0d615bb GROOVIE: Use the ScummVM save/load dialogs for the in-game menu
c97f524b77 GROOVIE: Silence bogus warning when using digital music tracks


Commit: cbc0d615bb189bfd197b7b21e00a80175469b368
    https://github.com/scummvm/scummvm/commit/cbc0d615bb189bfd197b7b21e00a80175469b368
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-09-15T23:00:20+03:00

Commit Message:
GROOVIE: Use the ScummVM save/load dialogs for the in-game menu

Changed paths:
    engines/groovie/script.cpp


diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 70ba473e9e..e1f22f0b09 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -655,9 +655,9 @@ void Script::o_videofromref() {			// 0x09
 		}
 		break;
 
-	case 0x2420:	// load from main menu
+	case 0x2420:	// load from the main menu
 		if (_version == kGroovieT7G && !ConfMan.getBool("originalsaveload")) {
-			GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"), false);
+			GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
 			int slot = dialog->runModalWithCurrentTarget();
 			delete dialog;
 
@@ -673,6 +673,42 @@ void Script::o_videofromref() {			// 0x09
 		}
 		break;
 
+	case 0x2422: // save from the in-game menu
+		if (_version == kGroovieT7G && !ConfMan.getBool("originalsaveload")) {
+			GUI::MessageDialog saveOrLoad(_("Would you like to save or restore a game?"), _("Save"), _("Restore"));
+
+			int choice = saveOrLoad.runModal();
+			if (choice == GUI::kMessageOK) {
+				// Save
+				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 = 0x17C8; // back to game menu
+			} else {
+				// Restore
+				GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+				int slot = dialog->runModalWithCurrentTarget();
+				delete dialog;
+
+				if (slot >= 0) {
+					_currentInstruction = 0x287;
+					_bitflags = 0;
+					setVariable(0x19, slot);
+				} else {
+					_currentInstruction = 0x17C8; // back to game menu
+				}
+			}
+
+			return;
+		}
+		break;
+
 	default:
 		break;
 	}


Commit: c97f524b77fc29553773518ffb1f7217a7247acd
    https://github.com/scummvm/scummvm/commit/c97f524b77fc29553773518ffb1f7217a7247acd
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-09-15T23:00:21+03:00

Commit Message:
GROOVIE: Silence bogus warning when using digital music tracks

Changed paths:
    engines/groovie/music.cpp


diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index 5112e38dd2..8d1f775936 100644
--- a/engines/groovie/music.cpp
+++ b/engines/groovie/music.cpp
@@ -728,6 +728,12 @@ bool MusicPlayerIOS::load(uint32 fileref, bool loop) {
 		info.filename.deleteLastChar();
 	}
 
+	if (info.filename == "ini_sc") {
+		// This is an initialization MIDI file, which is not
+		// needed for digital tracks
+		return false;
+	}
+
 	// Create the audio stream
 	Audio::SeekableAudioStream *seekStream = Audio::SeekableAudioStream::openStreamFile(info.filename);