[Scummvm-cvs-logs] scummvm master -> 7824d0e8e9116e2610072a92c99c6d80ae9db19f
bluegr
bluegr at gmail.com
Sat Sep 1 19:19:25 CEST 2012
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:
7824d0e8e9 SCI: Limit the hack used for sound initialization to the Fun Seeker's demo only
Commit: 7824d0e8e9116e2610072a92c99c6d80ae9db19f
https://github.com/scummvm/scummvm/commit/7824d0e8e9116e2610072a92c99c6d80ae9db19f
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-09-01T10:17:27-07:00
Commit Message:
SCI: Limit the hack used for sound initialization to the Fun Seeker's demo only
Changed paths:
engines/sci/sound/drivers/adlib.cpp
engines/sci/sound/music.cpp
diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp
index db9317e..191e13d 100644
--- a/engines/sci/sound/drivers/adlib.cpp
+++ b/engines/sci/sound/drivers/adlib.cpp
@@ -807,6 +807,9 @@ int MidiPlayer_AdLib::open(ResourceManager *resMan) {
int size = f.size();
const uint patchSize = 1344;
+ // Note: Funseeker's Guide also has another version of adl.drv, 8803 bytes.
+ // This isn't supported, but it's not really used anywhere, as that demo
+ // doesn't have sound anyway.
if ((size == 5684) || (size == 5720) || (size == 5727)) {
byte *buf = new byte[patchSize];
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index ffd51da..a8a65d2 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -125,10 +125,13 @@ void SciMusic::init() {
_pMidiDrv->setTimerCallback(this, &miditimerCallback);
_dwTempo = _pMidiDrv->getBaseTempo();
} else {
- // Happens in the Fun Seeker's Guide demo, which doesn't have any sound
- // anyway (nor works if anything other than PC Spearker is set), so this
- // shouldn't be fatal
- warning("Failed to initialize sound driver");
+ if (g_sci->getGameId() == GID_FUNSEEKER) {
+ // HACK: The Fun Seeker's Guide demo doesn't have patch 3 and the version
+ // of the Adlib driver (adl.drv) that it includes is unsupported. That demo
+ // doesn't have any sound anyway, so this shouldn't be fatal.
+ } else {
+ error("Failed to initialize sound driver");
+ }
}
// Find out what the first possible channel is (used, when doing channel
More information about the Scummvm-git-logs
mailing list