aboutsummaryrefslogtreecommitdiff
path: root/scumm/scummvm.cpp
diff options
context:
space:
mode:
authorTravis Howell2003-08-17 02:34:34 +0000
committerTravis Howell2003-08-17 02:34:34 +0000
commit53d1db8caea6e7e1a9f4fd27f0d516ecaeb0c150 (patch)
treecdb4ba9bbbef7e89a8bf3d9501ceefe4b031c398 /scumm/scummvm.cpp
parent0914e57d214cd47e8f9cd7b915e8476bc77f7e19 (diff)
downloadscummvm-rg350-53d1db8caea6e7e1a9f4fd27f0d516ecaeb0c150.tar.gz
scummvm-rg350-53d1db8caea6e7e1a9f4fd27f0d516ecaeb0c150.tar.bz2
scummvm-rg350-53d1db8caea6e7e1a9f4fd27f0d516ecaeb0c150.zip
Fix regressions in MI1 Amiga
Revert last change to MI1 demo fix and make it monkeyega target only. svn-id: r9732
Diffstat (limited to 'scumm/scummvm.cpp')
-rw-r--r--scumm/scummvm.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index db2ea574f6..f99ac2f159 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -624,7 +624,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
_playerV2 = NULL;
if (_features & GF_DIGI_IMUSE) {
_imuseDigital = new IMuseDigital(this);
- } else if ((_features & GF_AMIGA) && (_features & GF_OLD_BUNDLE)) {
+ } else if ((_features & GF_AMIGA) && (_version < 5)) {
_playerV2 = NULL;
} else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && ((_version > 2) && (_version < 5))) {
_playerV2 = new Player_V2(this);
@@ -1057,7 +1057,7 @@ void Scumm::initScummVars() {
case MD_PCSPK:
case MD_PCJR: VAR(VAR_SOUNDCARD) = 1; break;
default:
- if (_features & GF_SMALL_HEADER)
+ if (_features & GF_SMALL_HEADER && !(_features & GF_AMIGA))
VAR(VAR_SOUNDCARD) = 4;
else
VAR(VAR_SOUNDCARD) = 3;
@@ -1761,8 +1761,7 @@ void Scumm::startScene(int room, Actor *a, int objectNr) {
if (!(_features & GF_SMALL_HEADER) && VAR_NEW_ROOM != 0xFF) // Disable for SH games. Overwrites
VAR(VAR_NEW_ROOM) = room; // gamevars, eg Zak cashcards
- if (_currentRoom)
- runExitScript();
+ runExitScript();
killScriptsAndResources();
clearEnqueue();
stopCycle(0);