[Scummvm-cvs-logs] CVS: scummvm/scumm wiz_he.cpp,2.63,2.64

[kirben]

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

Modified Files:
	wiz_he.cpp 
Log Message:

Fix header check when using external wizImage files.


Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.63
retrieving revision 2.64
diff -u -d -r2.63 -r2.64
--- wiz_he.cpp	21 Apr 2005 19:39:15 -0000	2.63
+++ wiz_he.cpp	22 Apr 2005 03:30:58 -0000	2.64
@@ -1621,7 +1621,7 @@
 }
 
 void ScummEngine_v90he::processWizImage(const WizParameters *params) {
-	debug(1, "processWizImage: processMode %d", params->processMode);
+	debug(0, "processWizImage: processMode %d", params->processMode);
 	switch (params->processMode) {
 	case 0:
 		// Used in racedemo
@@ -1635,16 +1635,9 @@
 	case 3:
 		if (params->processFlags & kWPFUseFile) {
 			File f;
-			if (!f.open((const char *)params->filename, File::kFileReadMode)) {
-				VAR(VAR_GAME_LOADED) = -3;
-				VAR(119) = -3;
-				warning("Unable to open for read '%s'", params->filename);
-			} else {
-				uint32 id = f.readUint32BE();
-				if (id != MKID('AWIZ') && id != MKID('MULT')) {
-					VAR(VAR_GAME_LOADED) = -1;
-					VAR(119) = -1;
-				} else {
+			if (f.open((const char *)params->filename, File::kFileReadMode)) {
+				uint32 id = f.readUint32LE();
+				if (id == TO_LE_32(MKID('AWIZ')) || id == TO_LE_32(MKID('MULT'))) {
 					uint32 size = f.readUint32BE();
 					f.seek(0, SEEK_SET);
 					byte *p = res.createResource(rtImage, params->img.resNum, size);
@@ -1657,8 +1650,15 @@
 						VAR(VAR_GAME_LOADED) = 0;
 						VAR(119) = 0;
 					}
+				} else {
+					VAR(VAR_GAME_LOADED) = -1;
+					VAR(119) = -1;
 				}
 				f.close();
+			} else {
+				VAR(VAR_GAME_LOADED) = -3;
+				VAR(119) = -3;
+				warning("Unable to open for read '%s'", params->filename);
 			}
 		}
 		break;