aboutsummaryrefslogtreecommitdiff
path: root/engines/agos
diff options
context:
space:
mode:
authorMartin Kiewitz2015-06-21 01:20:21 +0200
committerMartin Kiewitz2015-06-21 01:20:21 +0200
commit69436f6c41bab32112e1dcba324f24f502df58af (patch)
tree6b26442ecc66a474c404f7f854ada08852e37e18 /engines/agos
parentd24c68c739dadd1404d937f9a21d93e8841a09ee (diff)
downloadscummvm-rg350-69436f6c41bab32112e1dcba324f24f502df58af.tar.gz
scummvm-rg350-69436f6c41bab32112e1dcba324f24f502df58af.tar.bz2
scummvm-rg350-69436f6c41bab32112e1dcba324f24f502df58af.zip
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
Diffstat (limited to 'engines/agos')
-rw-r--r--engines/agos/drivers/accolade/adlib.cpp2
-rw-r--r--engines/agos/midi.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/agos/drivers/accolade/adlib.cpp b/engines/agos/drivers/accolade/adlib.cpp
index 2ef1264e23..056cd7aea0 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 d75b7b8cb7..3091d58ec2 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;