From 1a7b4a7d7c654fca8efad976ffb81bde0d16c15a Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 23 Apr 2006 20:02:33 +0000
Subject: Added a comment regarding COMI disc changing

svn-id: r22117
---
 engines/scumm/resource.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index 2218943cda..beeff2f63c 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -85,13 +85,15 @@ void ScummEngine::openRoom(const int room) {
 	// Load the disk numer / room offs (special case for room 0 exists because
 	// room 0 contains the data which is used to create the roomno / roomoffs
 	// tables -- hence obviously we mustn't use those when loading room 0.
-	const int diskNumber = room ? res.roomno[rtRoom][room] : 0;
-	const int room_offs = room ? res.roomoffs[rtRoom][room] : 0;
+	const uint32 diskNumber = room ? res.roomno[rtRoom][room] : 0;
+	const uint32 room_offs = room ? res.roomoffs[rtRoom][room] : 0;
 
 	// FIXME: Since room_offs is const, clearly the following loop either
 	// is never entered, or loops forever (if it wasn't for the return/error
 	// statements in it, that is). -> This should be cleaned up!
-	while (room_offs != -1) {
+	// Maybe we should re-enabled the looping properly, to deal with disc
+	// changes in COMI ?
+	while (room_offs != 0xFFFFFFFF) {
 
 		if (room_offs != 0 && room != 0 && _game.heversion < 98) {
 			_fileOffset = res.roomoffs[rtRoom][room];
-- 
cgit v1.2.3