aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-05-24 04:48:39 +0000
committerTorbjörn Andersson2006-05-24 04:48:39 +0000
commitf83f1a77b6f5a025432a3b8b0ee6bd9f9985dbc2 (patch)
treeeac79bc739b01bf372a1990e3e5f970feb22a2b4
parent2f51f40c1189de161824f15f29f00e072f3c43ec (diff)
downloadscummvm-rg350-f83f1a77b6f5a025432a3b8b0ee6bd9f9985dbc2.tar.gz
scummvm-rg350-f83f1a77b6f5a025432a3b8b0ee6bd9f9985dbc2.tar.bz2
scummvm-rg350-f83f1a77b6f5a025432a3b8b0ee6bd9f9985dbc2.zip
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
-rw-r--r--engines/sword2/resman.cpp2
1 files changed, 1 insertions, 1 deletions
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;