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

[mgerhardy]

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:
ddb0420ef6 TWINE: fixed LBA1 GOG version - Adeline jingle does not play at all


Commit: ddb0420ef63221a45202139378744f27c259f0ca
    https://github.com/scummvm/scummvm/commit/ddb0420ef63221a45202139378744f27c259f0ca
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2023-08-09T01:16:00+02:00

Commit Message:
TWINE: fixed LBA1 GOG version - Adeline jingle does not play at all

https://bugs.scummvm.org/ticket/13132

Changed paths:
    engines/twine/audio/music.cpp


diff --git a/engines/twine/audio/music.cpp b/engines/twine/audio/music.cpp
index 44bef93cbb6..48bc44cf21d 100644
--- a/engines/twine/audio/music.cpp
+++ b/engines/twine/audio/music.cpp
@@ -219,8 +219,8 @@ void Music::stopTrackMusic() {
 }
 
 bool Music::playMidiMusic(int32 midiIdx, int32 loop) {
-	if (!_engine->_cfgfile.Sound || _engine->_cfgfile.MidiType == MIDIFILE_NONE) {
-		debug("midi disabled - skip playing %i", midiIdx);
+	if (!_engine->_cfgfile.Sound) {
+		debug("sound disabled - skip playing %i", midiIdx);
 		return false;
 	}
 
@@ -232,13 +232,6 @@ bool Music::playMidiMusic(int32 midiIdx, int32 loop) {
 	stopMusic();
 	currentMusic = midiIdx;
 
-	const char *filename;
-	if (_engine->_cfgfile.MidiType == MIDIFILE_DOS) {
-		filename = Resources::HQR_MIDI_MI_DOS_FILE;
-	} else {
-		filename = Resources::HQR_MIDI_MI_WIN_FILE;
-	}
-
 	if (midiPtr) {
 		musicFadeOut();
 		stopMidiMusic();
@@ -255,6 +248,16 @@ bool Music::playMidiMusic(int32 midiIdx, int32 loop) {
 		}
 	}
 
+	const char *filename;
+	if (_engine->_cfgfile.MidiType == MIDIFILE_DOS) {
+		filename = Resources::HQR_MIDI_MI_DOS_FILE;
+	} else if (_engine->_cfgfile.MidiType == MIDIFILE_WIN){
+		filename = Resources::HQR_MIDI_MI_WIN_FILE;
+	} else {
+		debug("midi disabled - skip playing %i", midiIdx);
+		return false;
+	}
+
 	int32 midiSize = HQR::getAllocEntry(&midiPtr, filename, midiIdx);
 	if (midiSize == 0) {
 		debug("Could not find midi file for index %i", midiIdx);