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

[bluegr]

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:
f24a25b502 GROOVIE: Implement loading from the launcher for Clandestiny and UHP


Commit: f24a25b502af4bdc1bfaad217781c8e6ea05b065
    https://github.com/scummvm/scummvm/commit/f24a25b502af4bdc1bfaad217781c8e6ea05b065
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-10-26T04:51:11+03:00

Commit Message:
GROOVIE: Implement loading from the launcher for Clandestiny and UHP

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


diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp
index e37fad4466..90f5984fcf 100644
--- a/engines/groovie/detection.cpp
+++ b/engines/groovie/detection.cpp
@@ -281,7 +281,7 @@ static const GroovieGameDescription gameDescriptions[] = {
 			AD_ENTRY2s("clanmain.grv", "dd424120fa1daa9d6b576d0ba22a4936", 54253,
 						"ACT01MUS.MPG", NULL, -1),
 			Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE,
-			GUIO3(GUIO_NOMIDI, GUIO_NOLAUNCHLOAD, GUIO_NOASPECT)
+			GUIO3(GUIO_NOMIDI, GUIO_NOASPECT)
 		},
 		kGroovieCDY
 	},
@@ -293,7 +293,7 @@ static const GroovieGameDescription gameDescriptions[] = {
             AD_ENTRY2s("CLANMAIN.GRV", "dd424120fa1daa9d6b576d0ba22a4936", 54253,
                        "ACT01MUS.m4a", NULL, -1),
             Common::EN_ANY, Common::kPlatformUnknown, ADGF_UNSTABLE,
-            GUIO3(GUIO_NOMIDI, GUIO_NOLAUNCHLOAD, GUIO_NOASPECT)
+            GUIO3(GUIO_NOMIDI, GUIO_NOASPECT)
         },
         kGroovieCDY
     },
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 625777cd18..3a0f606ffd 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -242,6 +242,14 @@ void Script::directGameLoad(int slot) {
 		setVariable(0xF, slot);
 		_currentInstruction = 0xE78D;
 		return;
+	} else if (_version == kGroovieCDY) {
+		setVariable(0x1, slot);
+		_currentInstruction = 0x9EBF;
+		return;
+	} else if (_version == kGroovieUHP) {
+		setVariable(0x19, slot);
+		_currentInstruction = 0x23B4;
+		return;
 	}
 
 	if (midiInitScript && !_vm->_musicPlayer->isMidiInit()) {