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

[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:
f40934e496 GROOVIE: Do not wait for MIDI initialization with enhanced music tracks


Commit: f40934e4961f4eaf46d142fe4e6c24ab52549ecf
    https://github.com/scummvm/scummvm/commit/f40934e4961f4eaf46d142fe4e6c24ab52549ecf
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-09-13T01:09:00+03:00

Commit Message:
GROOVIE: Do not wait for MIDI initialization with enhanced music tracks

This prevents the game from getting stuck in the MIDI initialization
screen if a MIDI/MT-32 driver is selected and enhanced music tracks are
present. In this case, MusicPlayerIOS is used, which plays the digital
music tracks, and does not perform any MIDI initialization

Changed paths:
    engines/groovie/script.cpp


diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 071e88350f..5d5f606fe1 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -629,8 +629,9 @@ void Script::o_videofromref() {			// 0x09
 	}
 
 	// Determine if the MT-32 or GM initialization video is being played
-	bool gmInitVideo = _version == kGroovieT7G && fileref == 0x2460;
-	bool mt32InitVideo = _version == kGroovieT7G && fileref == 0x2461;
+	const bool enhancedMusicTracksExist = _version == kGroovieT7G && Common::File::exists("gu16.ogg");
+	const bool gmInitVideo = _version == kGroovieT7G && fileref == 0x2460 && !enhancedMusicTracksExist;
+	const bool mt32InitVideo = _version == kGroovieT7G && fileref == 0x2461 && !enhancedMusicTracksExist;
 	// Play the video
 	// If a MIDI init video is being played, loop it until the "audio"
 	// (init commands) has finished playing