[Scummvm-cvs-logs] CVS: scummvm/sword2 resman.cpp,1.115.2.1,1.115.2.2

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Sun Jan 1 06:11:01 CET 2006


Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27402

Modified Files:
      Tag: branch-0-8-0
	resman.cpp 
Log Message:
Backported fix for missing speech/music in the second half of the game.


Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.cpp,v
retrieving revision 1.115.2.1
retrieving revision 1.115.2.2
diff -u -d -r1.115.2.1 -r1.115.2.2
--- resman.cpp	18 Oct 2005 02:11:27 -0000	1.115.2.1
+++ resman.cpp	1 Jan 2006 14:10:06 -0000	1.115.2.2
@@ -153,10 +153,24 @@
 
 	for (i = 0; i < _totalClusters; i++) {
 		file.read(cdInf[i].clusterName, sizeof(cdInf[i].clusterName));
+
 		cdInf[i].cd = file.readByte();
 
 		if (file.ioFailed())
 			error("Cannot read cd.inf");
+
+		// It has been reported that there are two different versions
+		// of the cd.inf file: One where all clusters on CD also have
+		// the LOCAL_CACHE bit set. This bit is no longer used. To
+		// avoid future problems, let's normalize the flag once and for
+		// all here.
+
+		if (cdInf[i].cd & LOCAL_PERM)
+			cdInf[i].cd = LOCAL_PERM;
+		else if (cdInf[i].cd & CD2)
+			cdInf[i].cd = CD2;
+		else
+			cdInf[i].cd = CD1;
 	}
 
 	file.close();





More information about the Scummvm-git-logs mailing list