[Scummvm-git-logs] scummvm master -> 9336c93da3371a6cf7b54a48dea53c6575ee1c00

[mgerhardy]

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:
5544229d7c TWINE: fixed warning
9336c93da3 TWINE: fixed dotemu cd track issue


Commit: 5544229d7c439e3f25e78a034d20c4a5791409ea
    https://github.com/scummvm/scummvm/commit/5544229d7c439e3f25e78a034d20c4a5791409ea
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-11-27T20:36:57+01:00

Commit Message:
TWINE: fixed warning

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


diff --git a/engines/twine/audio/music.cpp b/engines/twine/audio/music.cpp
index d1f03bafa4..5ad56be6ed 100644
--- a/engines/twine/audio/music.cpp
+++ b/engines/twine/audio/music.cpp
@@ -121,7 +121,6 @@ void Music::musicFadeOut() {
 }
 
 static const char *musicTracksLba2[] = {
-	""
 	"",
 	"TADPCM1",
 	"TADPCM2",


Commit: 9336c93da3371a6cf7b54a48dea53c6575ee1c00
    https://github.com/scummvm/scummvm/commit/9336c93da3371a6cf7b54a48dea53c6575ee1c00
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-11-27T20:36:57+01:00

Commit Message:
TWINE: fixed dotemu cd track issue

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


diff --git a/engines/twine/audio/music.cpp b/engines/twine/audio/music.cpp
index 5ad56be6ed..67c812e6b1 100644
--- a/engines/twine/audio/music.cpp
+++ b/engines/twine/audio/music.cpp
@@ -172,6 +172,9 @@ bool Music::playTrackMusicCd(int32 track) {
 	}
 
 	AudioCDManager *cdrom = g_system->getAudioCDManager();
+	if (_engine->isDotEmuEnhanced()) {
+		track += 1;
+	}
 	return cdrom->play(track, 1, 0, 0);
 }