[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.339.2.4,1.339.2.5

Andrew Kurushin h00ligan at users.sourceforge.net
Fri Oct 21 08:22:09 CEST 2005


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

Modified Files:
      Tag: branch-0-8-0
	resource.cpp 
Log Message:
fix compilation warn

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.339.2.4
retrieving revision 1.339.2.5
diff -u -d -r1.339.2.4 -r1.339.2.5
--- resource.cpp	21 Oct 2005 02:30:49 -0000	1.339.2.4
+++ resource.cpp	21 Oct 2005 15:20:24 -0000	1.339.2.5
@@ -388,7 +388,7 @@
 
 bool checkTryMedia(BaseScummFile *handle) {
 	byte buf[TRYMEDIA_MARK_LEN];
-	bool matched;
+	bool matched = true;
 	const byte magic[2][TRYMEDIA_MARK_LEN] = 
 		{{ 0x00,  'T', 'M', 'S', 'A', 'M' },
 		 { 'i',   '=', '$', ':', '(', '$' }};  // Same but 0x69 xored
@@ -398,8 +398,10 @@
 	for (int i = 0; i < 2; i++) {
 		matched = true;
 		for (int j = 0; j < TRYMEDIA_MARK_LEN; j++)
-			if (buf[j] != magic[i][j])
+			if (buf[j] != magic[i][j]) {
 				matched = false;
+				break;
+			}
 
 		if (matched)
 			break;





More information about the Scummvm-git-logs mailing list