diff options
| author | Walter van Niftrik | 2016-08-29 12:30:20 +0200 |
|---|---|---|
| committer | Walter van Niftrik | 2016-08-29 14:27:03 +0200 |
| commit | 31b5a0bf6365b0bdf03458ffb3fe4dc6e4698b1e (patch) | |
| tree | cf3b442808ca17850e3c5039aa2d9ecadfcce4af /engines/adl | |
| parent | b84076789aeb8c12a7001051282d31414200968a (diff) | |
| download | scummvm-rg350-31b5a0bf6365b0bdf03458ffb3fe4dc6e4698b1e.tar.gz scummvm-rg350-31b5a0bf6365b0bdf03458ffb3fe4dc6e4698b1e.tar.bz2 scummvm-rg350-31b5a0bf6365b0bdf03458ffb3fe4dc6e4698b1e.zip | |
ADL: Fix hires4 disk swapping
Diffstat (limited to 'engines/adl')
| -rw-r--r-- | engines/adl/hires4.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/adl/hires4.cpp b/engines/adl/hires4.cpp index 70287dd307..cdb9f96f60 100644 --- a/engines/adl/hires4.cpp +++ b/engines/adl/hires4.cpp @@ -46,7 +46,6 @@ void HiRes4Engine::init() { error("Failed to open disk image '%s'", getDiskImageName(0)); insertDisk(1); - loadCommonData(); StreamPtr stream(createReadStream(_boot, 0x06, 0x2)); @@ -92,9 +91,11 @@ void HiRes4Engine::init() { void HiRes4Engine::loadRoom(byte roomNr) { if (roomNr >= 59 && roomNr < 113) { - insertDisk(2); - rebindDisk(); - } else { + if (_curDisk != 2) { + insertDisk(2); + rebindDisk(); + } + } else if (_curDisk != 1) { insertDisk(1); rebindDisk(); } @@ -138,7 +139,6 @@ void HiRes4Engine::insertDisk(byte diskNr) { _curDisk = diskNr; delete _disk; - _disk = new DiskImage(); if (!_disk->open(getDiskImageName(diskNr))) error("Failed to open disk image '%s'", getDiskImageName(diskNr)); |