From f83f1a77b6f5a025432a3b8b0ee6bd9f9985dbc2 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Wed, 24 May 2006 04:48:39 +0000
Subject: Only check if the files on "CD 0" are present. The others are
 requested with "insert CD" messages. (Of course, that isn't supported, or
 even well tested, but the idea is sound.) This makes it possible to run the
 BS2 demo again.

Incidentally, this is how I *meant* for it to work when I added that check - I
even wrote so in the comment above that section of the code - so how on earth
did I manage to screw it up like that?

svn-id: r22594
---
 engines/sword2/resman.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/sword2/resman.cpp b/engines/sword2/resman.cpp
index 202ac54065..bec2c5b9b7 100644
--- a/engines/sword2/resman.cpp
+++ b/engines/sword2/resman.cpp
@@ -183,7 +183,7 @@ bool ResourceManager::init() {
 		// during game-play (oh, that wascally wabbit!) in which case
 		// the resource manager will print a fatal error.
 
-		if (!Common::File::exists((char *)cdInf[i].clusterName)) {
+		if (cdInf[i].cd == 0 && !Common::File::exists((char *)cdInf[i].clusterName)) {
 			_vm->GUIErrorMessage("Broken Sword 2: Cannot find " + Common::String((char *)cdInf[i].clusterName));
 			delete [] cdInf;
 			return false;
-- 
cgit v1.2.3