[Scummvm-cvs-logs] scummvm master -> 1d8646ee015fbf34e5d9fcc7e5f4ff589762a830

[m-kiewitz]

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:
1d8646ee01 TINSEL: Enable Miles Audio for DW1+DW1CD Demo only


Commit: 1d8646ee015fbf34e5d9fcc7e5f4ff589762a830
    https://github.com/scummvm/scummvm/commit/1d8646ee015fbf34e5d9fcc7e5f4ff589762a830
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-09T02:14:08+01:00

Commit Message:
TINSEL: Enable Miles Audio for DW1+DW1CD Demo only

DW1 floppy demo doesn't seem to have audio at all

Changed paths:
    engines/tinsel/music.cpp



diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index 2a98042..e0c1f8d 100644
--- a/engines/tinsel/music.cpp
+++ b/engines/tinsel/music.cpp
@@ -381,11 +381,25 @@ MidiMusicPlayer::MidiMusicPlayer(TinselEngine *vm) {
 	bool milesAudioEnabled = false;
 
 	if (vm->getPlatform() == Common::kPlatformDOS) {
-		// Enable Miles Audio for DOS only
-		milesAudioEnabled = true;
+		// Enable Miles Audio for DOS platform only...
+		switch (vm->getGameID()) {
+		case GID_DW1:
+			if (!vm->getIsADGFDemo()) {
+				// ...for Discworld 1
+				milesAudioEnabled = true;
+			} else {
+				if (vm->isV1CD()) {
+					// ...and for Discworld 1 CD Demo
+					milesAudioEnabled = true;
+				}
+			}
+			break;
+		default:
+			break;
+		}
 	}
 
-	if ((vm->getGameId() == GID_DW1) && (milesAudioEnabled)) {
+	if (milesAudioEnabled) {
 		// Discworld 1 (DOS) uses Miles Audio 3
 		// use our own Miles Audio drivers
 		//