From bcd5df5c6e94a1d6c9cfb97f27a0306b8ff54e60 Mon Sep 17 00:00:00 2001
From: Walter van Niftrik
Date: Sun, 28 Aug 2016 01:13:15 +0200
Subject: ADL: Load hires4 rooms

---
 engines/adl/hires2.cpp | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'engines/adl/hires2.cpp')

diff --git a/engines/adl/hires2.cpp b/engines/adl/hires2.cpp
index 34de51885a..b662142f0c 100644
--- a/engines/adl/hires2.cpp
+++ b/engines/adl/hires2.cpp
@@ -142,21 +142,9 @@ void HiRes2Engine::initGameState() {
 	_state.vars.resize(IDI_HR2_NUM_VARS);
 
 	StreamPtr stream(_disk->createReadStream(0x21, 0x5, 0x0e, 7));
-
-	for (uint i = 0; i < IDI_HR2_NUM_ROOMS; ++i) {
-		Room room;
-		stream->readByte(); // number
-		for (uint j = 0; j < 6; ++j)
-			room.connections[j] = stream->readByte();
-		room.data = readDataBlockPtr(*stream);
-		room.picture = stream->readByte();
-		room.curPicture = stream->readByte();
-		room.isFirstTime = stream->readByte();
-		_state.rooms.push_back(room);
-	}
+	loadRooms(*stream, IDI_HR2_NUM_ROOMS);
 
 	stream.reset(_disk->createReadStream(0x21, 0x0, 0x00, 2));
-
 	loadItems(*stream);
 }
 
-- 
cgit v1.2.3