[Scummvm-cvs-logs] CVS: scummvm/sword2 function.cpp,1.51,1.52 resman.cpp,1.83,1.84

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv10957

Modified Files:
	function.cpp resman.cpp 
Log Message:
cleanup


Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/function.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- function.cpp	9 Jan 2004 14:52:38 -0000	1.51
+++ function.cpp	11 Jan 2004 16:49:18 -0000	1.52
@@ -446,14 +446,12 @@
 
 	// Read the "Smacker" logo
 
-	f.open("credits.bmp");
-
 	uint16 logoWidth = 0;
 	uint16 logoHeight = 0;
 	uint8 *logoData = NULL;
 	uint8 palette[1024];
 
-	if (f.isOpen()) {
+	if (f.open("credits.bmp")) {
 		logoWidth = f.readUint16LE();
 		logoHeight = f.readUint16LE();
 
@@ -491,8 +489,7 @@
 
 	char textLine[80];
 
-	f.open("credits.clu");
-	if (!f.isOpen()) {
+	if (!f.open("credits.clu")) {
 		warning("Can't find credits.clu");
 		return IR_CONT;
 	}

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- resman.cpp	7 Jan 2004 07:42:00 -0000	1.83
+++ resman.cpp	11 Jan 2004 16:49:18 -0000	1.84
@@ -521,11 +521,8 @@
 			sprintf(buf, "dumps/%s-%d.dmp", tag, res);
 #endif
 
-			out.open(buf, "");
-
-			if (!out.isOpen()) {
-				out.open(buf, "", File::kFileWriteMode);
-				if (out.isOpen())
+			if (!out.open(buf, "")) {
+				if (out.open(buf, "", File::kFileWriteMode))
 					out.write(_resList[res]->ad, len);
 			}