[Scummvm-cvs-logs] scummvm master -> 69436f6c41bab32112e1dcba324f24f502df58af

[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:
69436f6c41 AGOS: Elvira 2 seems to use MUSIC.DRV variant


Commit: 69436f6c41bab32112e1dcba324f24f502df58af
    https://github.com/scummvm/scummvm/commit/69436f6c41bab32112e1dcba324f24f502df58af
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-21T01:20:21+02:00

Commit Message:
AGOS: Elvira 2 seems to use MUSIC.DRV variant

- Kirben told me that Elvira 2 is shipped with MUSIC.DRV and
INSTR.DAT file. Using MUSIC.DRV file makes the music work properly
I couldn't check, b/c I own none of these games.

- also commented out implemented bug of INSTR.DAT/MUSIC.DRV
This bug only affected the adlib drivers, so I guess we should
rather fix it instead of implementing the same buggy behavior

Changed paths:
    engines/agos/drivers/accolade/adlib.cpp
    engines/agos/midi.cpp



diff --git a/engines/agos/drivers/accolade/adlib.cpp b/engines/agos/drivers/accolade/adlib.cpp
index 2ef1264..056cd7a 100644
--- a/engines/agos/drivers/accolade/adlib.cpp
+++ b/engines/agos/drivers/accolade/adlib.cpp
@@ -542,6 +542,7 @@ void MidiDriver_Accolade_AdLib::noteOnSetVolume(byte FMvoiceChannel, byte operat
 			}
 
 			// not sure, if we are supposed to implement these bugs, or not
+#if 0
 			if (!_musicDrvMode) {
 				// Table is 16 bytes instead of 18 bytes
 				if ((FMvoiceChannel == 7) || (FMvoiceChannel == 9)) {
@@ -558,6 +559,7 @@ void MidiDriver_Accolade_AdLib::noteOnSetVolume(byte FMvoiceChannel, byte operat
 					warning("volume set bug (original)");
 				}
 			}
+#endif
 		}
 	}
 
diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp
index d75b7b8..3091d58 100644
--- a/engines/agos/midi.cpp
+++ b/engines/agos/midi.cpp
@@ -86,9 +86,9 @@ int MidiPlayer::open(int gameType, bool isDemo) {
 
 	switch (gameType) {
 	case GType_ELVIRA1:
-	case GType_ELVIRA2:
 		_accolade_mode = true;
 		break;
+	case GType_ELVIRA2:
 	case GType_WW:
 		_accolade_mode = true;
 		accolade_useMusicDrvFile = true;