[Scummvm-cvs-logs] scummvm master -> 6a49654d861b7b3a46f101f4f7ce35ca5bdb9644

[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:
6a49654d86 SAGA: Fall back to the default Adlib driver for non-DOS versions of ITE


Commit: 6a49654d861b7b3a46f101f4f7ce35ca5bdb9644
    https://github.com/scummvm/scummvm/commit/6a49654d861b7b3a46f101f4f7ce35ca5bdb9644
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-07-13T02:21:51+03:00

Commit Message:
SAGA: Fall back to the default Adlib driver for non-DOS versions of ITE

Only the DOS version of ITE uses the Miles audio driver

Changed paths:
    engines/saga/music.cpp



diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 5bff06d..6a362a6 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -48,11 +48,15 @@ MusicDriver::MusicDriver() : _isGM(false) {
 
 	switch (_driverType) {
 	case MT_ADLIB:
-		_milesAudioMode = true;
 		if (Common::File::exists("INSTR.AD") && Common::File::exists("INSTR.OPL")) {
+			_milesAudioMode = true;
 			_driver = Audio::MidiDriver_Miles_AdLib_create("INSTR.AD", "INSTR.OPL");
+		} else if (Common::File::exists("INSTR.AD") && Common::File::exists("INSTR.OPL")) {
+			_milesAudioMode = true;
+			_driver = Audio::MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.OPL");
 		} else {
-			_driver = Audio::MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.OPL");		
+			_milesAudioMode = false;
+			MidiPlayer::createDriver();
 		}
 		break;
 	case MT_MT32: