diff options
| author | Travis Howell | 2003-07-14 08:42:02 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-07-14 08:42:02 +0000 |
| commit | 21266bfc79f3462537b182ffef1de40e2bfaddd8 (patch) | |
| tree | c57d060d002f6233126571298f333108a6bdb910 | |
| parent | 74d3d914a93dd3914e74aed278eb8f9383f51783 (diff) | |
| download | scummvm-rg350-21266bfc79f3462537b182ffef1de40e2bfaddd8.tar.gz scummvm-rg350-21266bfc79f3462537b182ffef1de40e2bfaddd8.tar.bz2 scummvm-rg350-21266bfc79f3462537b182ffef1de40e2bfaddd8.zip | |
zak v1 uses same sound resources as zak v2
svn-id: r9002
| -rw-r--r-- | scumm/scummvm.cpp | 5 | ||||
| -rw-r--r-- | scumm/sound.cpp | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 983e29fea4..8222bdb8ba 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -629,8 +629,9 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _imuse = NULL; _playerV2 = NULL; } else if (_features & GF_OLD_BUNDLE) { - _playerV2 = NULL; - if (!(_features & GF_AMIGA) && _version != 1) + if ((_features & GF_AMIGA) || ((_version == 1) && (_gameId == GID_MANIAC))) + _playerV2 = NULL; + else _playerV2 = new Player_V2(this); _imuse = NULL; _imuseDigital = NULL; diff --git a/scumm/sound.cpp b/scumm/sound.cpp index e957405b21..e934a1bbfc 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -487,7 +487,10 @@ void Sound::playSound(int soundID) { return; } - if (_scumm->_features & GF_OLD_BUNDLE && _scumm->_version != 1) { + if (_scumm->_features & GF_OLD_BUNDLE) { + //TODO: support maniac v1 sounds + if ((_scumm->_version == 1) && (_scumm->_gameId == GID_MANIAC)) + return; // other versions seem to be 0000 at this point... // hopefully this test is correct // 0xfe7f seems to be sound and 0x764a music |