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

[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:
f2b4ff71a6 GROOVIE: Fix loading from the launcher for T11H


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

Commit Message:
GROOVIE: Fix loading from the launcher for T11H

Changed paths:
    engines/groovie/script.cpp


diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 4822e642d3..625777cd18 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -238,11 +238,10 @@ void Script::directGameLoad(int slot) {
 			midiInitScript = t7gMidiInitScript;
 			midiInitScriptSize = sizeof(t7gMidiInitScript);
 		}
-	} else {
-		// 11th Hour
+	} else if (_version == kGroovieT11H) {
 		setVariable(0xF, slot);
-		// FIXME: This bypasses a lot of the game's initialization procedure
-		targetInstruction = 0xE78E;
+		_currentInstruction = 0xE78D;
+		return;
 	}
 
 	if (midiInitScript && !_vm->_musicPlayer->isMidiInit()) {