[Scummvm-cvs-logs] CVS: scummvm/simon saveload.cpp,1.17.2.1,1.17.2.2

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Sat Nov 5 06:27:24 CET 2005


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

Modified Files:
      Tag: branch-0-8-0
	saveload.cpp 
Log Message:
Call flush() after saving in SAGA, Simon and Broken Sword 2. (Backport from
trunk.)


Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/saveload.cpp,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -d -r1.17.2.1 -r1.17.2.2
--- saveload.cpp	18 Oct 2005 02:11:25 -0000	1.17.2.1
+++ saveload.cpp	5 Nov 2005 14:26:50 -0000	1.17.2.2
@@ -459,7 +459,7 @@
 			}
 		}
 
-		Child9 *child9 = (Child9 *) findChildOfType(item, 9);
+		Child9 *child9 = (Child9 *)findChildOfType(item, 9);
 		if (child9) {
 			for (i = 0; i != 4; i++) {
 				f->writeUint16BE(child9->array[i]);
@@ -487,11 +487,13 @@
 			f->writeUint16BE(_bitArray[i]);
 	}
 
-	delete f;
+	f->flush();
+	bool result = !f->ioFailed();
 
+	delete f;
 	_lockWord &= ~0x100;
 
-	return true;
+	return result;
 }
 
 char *SimonEngine::gen_savename(int slot) {





More information about the Scummvm-git-logs mailing list