[Scummvm-cvs-logs] SF.net SVN: scummvm: [22594] scummvm/trunk/engines/sword2/resman.cpp

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Tue May 23 21:49:01 CEST 2006


Revision: 22594
Author:   eriktorbjorn
Date:     2006-05-23 21:48:39 -0700 (Tue, 23 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22594&view=rev

Log Message:
-----------
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?

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/resman.cpp
Modified: scummvm/trunk/engines/sword2/resman.cpp
===================================================================
--- scummvm/trunk/engines/sword2/resman.cpp	2006-05-24 03:56:48 UTC (rev 22593)
+++ scummvm/trunk/engines/sword2/resman.cpp	2006-05-24 04:48:39 UTC (rev 22594)
@@ -183,7 +183,7 @@
 		// 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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list