diff options
| author | Jamieson Christian | 2003-05-26 23:16:24 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-05-26 23:16:24 +0000 |
| commit | bd61a1298ef92ce47607a923262caee004c0d54d (patch) | |
| tree | 703e1ce92db2e70c9051c9ae99d53949b1c2f016 /scumm | |
| parent | 2885a8a84e01e3e074f86615487e8cd34390aea6 (diff) | |
| download | scummvm-rg350-bd61a1298ef92ce47607a923262caee004c0d54d.tar.gz scummvm-rg350-bd61a1298ef92ce47607a923262caee004c0d54d.tar.bz2 scummvm-rg350-bd61a1298ef92ce47607a923262caee004c0d54d.zip | |
Added 'mmamiga' game ID to disable PC speaker emulator
svn-id: r8028
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scummvm.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 72781bd743..cb07aafc75 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -67,6 +67,8 @@ static const VersionSettings scumm_settings[] = { /* Scumm Version 2 */ {"maniac", "Maniac Mansion", GID_MANIAC, 2, 0, 0, GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"}, + {"mmamiga", "Maniac Mansion", GID_MANIAC, 2, 0, 0, + GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING | GF_AMIGA, "00.LFL"}, {"zak", "Zak McKracken and the Alien Mindbenders", GID_ZAK, 2, 0, 0, GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"}, @@ -612,8 +614,9 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _imuse = NULL; _playerV2 = NULL; } else if (_features & GF_OLD_BUNDLE && !(_features & GF_AFTER_V3)) { - debug (0, "Creating player"); - _playerV2 = new Player_V2(); + _playerV2 = NULL; + if (!(_features & GF_AMIGA)) + _playerV2 = new Player_V2(); _imuse = NULL; _imuseDigital = NULL; } else { |