diff options
| author | Fabio Battaglia | 2009-05-24 13:20:13 +0000 |
|---|---|---|
| committer | Fabio Battaglia | 2009-05-24 13:20:13 +0000 |
| commit | e6b62d945cf27942d69f6f6069967532b34c903d (patch) | |
| tree | 28411c2ae9eb0e6628c7129486bc088f36873f9f | |
| parent | 725ff24170dd23394b4aa6de075d9ca74a7c9199 (diff) | |
| download | scummvm-rg350-e6b62d945cf27942d69f6f6069967532b34c903d.tar.gz scummvm-rg350-e6b62d945cf27942d69f6f6069967532b34c903d.tar.bz2 scummvm-rg350-e6b62d945cf27942d69f6f6069967532b34c903d.zip | |
tinsel: disable midi playing for Discworld PSX, as the game uses the proprietary (and unsupported) PlayStation SEQ format
svn-id: r40860
| -rw-r--r-- | engines/tinsel/music.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 699765490f..f80217b4f4 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -179,6 +179,11 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { currentMidi = dwFileOffset; currentLoop = bLoop; + // Tinsel V1 PSX uses a different music format, so i + // disable it here. + // TODO: Maybe this should be moved to a better place... + if (TinselV1PSX) return false; + if (volMusic != 0) { SetMidiVolume(volMusic); } @@ -327,7 +332,8 @@ void OpenMidiFiles(void) { Common::File midiStream; // Demo version has no midi file - if ((_vm->getFeatures() & GF_DEMO) || (TinselVersion == TINSEL_V2)) + // Also, Discworld PSX uses still unsupported psx SEQ format for music... + if ((_vm->getFeatures() & GF_DEMO) || (TinselVersion == TINSEL_V2) || TinselV1PSX) return; if (midiBuffer.pDat) |