From 31b5a0bf6365b0bdf03458ffb3fe4dc6e4698b1e Mon Sep 17 00:00:00 2001
From: Walter van Niftrik
Date: Mon, 29 Aug 2016 12:30:20 +0200
Subject: ADL: Fix hires4 disk swapping

---
 engines/adl/hires4.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/adl')

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));
-- 
cgit v1.2.3