[Scummvm-cvs-logs] SF.net SVN: scummvm:[42502] scummvm/trunk/engines/cine/saveload.cpp

[buddha_ at users.sourceforge.net]

Revision: 42502
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42502&view=rev
Author:   buddha_
Date:     2009-07-15 13:04:17 +0000 (Wed, 15 Jul 2009)

Log Message:
-----------
Remove ioFailed() usage from Cine engine.

Modified Paths:
--------------
    scummvm/trunk/engines/cine/saveload.cpp

Modified: scummvm/trunk/engines/cine/saveload.cpp
===================================================================
--- scummvm/trunk/engines/cine/saveload.cpp	2009-07-15 10:04:50 UTC (rev 42501)
+++ scummvm/trunk/engines/cine/saveload.cpp	2009-07-15 13:04:17 UTC (rev 42502)
@@ -49,7 +49,7 @@
 	header.id      = in.readUint32BE();
 	header.version = in.readUint32BE();
 	header.size    = in.readUint32BE();
-	return !in.ioFailed();
+	return !(in.eos() || in.err());
 }
 
 /*! \brief Savegame format detector
@@ -240,21 +240,21 @@
 		in.read(objectTable[i].name, 20);
 		objectTable[i].part = in.readUint16BE();
 	}
-	return !in.ioFailed();
+	return !(in.eos() || in.err());
 }
 
 bool loadZoneData(Common::SeekableReadStream &in) {
 	for (int i = 0; i < 16; i++) {
 		zoneData[i] = in.readUint16BE();
 	}
-	return !in.ioFailed();
+	return !(in.eos() || in.err());
 }
 
 bool loadCommandVariables(Common::SeekableReadStream &in) {
 	for (int i = 0; i < 4; i++) {
 		commandVar3[i] = in.readUint16BE();
 	}
-	return !in.ioFailed();
+	return !(in.eos() || in.err());
 }
 
 bool loadScreenParams(Common::SeekableReadStream &in) {
@@ -265,7 +265,7 @@
 	in.readUint16BE();
 	in.readUint16BE();
 	in.readUint16BE();
-	return !in.ioFailed();
+	return !(in.eos() || in.err());
 }
 
 bool loadGlobalScripts(Common::SeekableReadStream &in) {
@@ -273,7 +273,7 @@
 	for (int i = 0; i < size; i++) {
 		loadScriptFromSave(in, true);
 	}
-	return !in.ioFailed();
+	return !(in.eos() || in.err());
 }
 
 bool loadObjectScripts(Common::SeekableReadStream &in) {
@@ -281,7 +281,7 @@
 	for (int i = 0; i < size; i++) {
 		loadScriptFromSave(in, false);
 	}
-	return !in.ioFailed();
+	return !(in.eos() || in.err());
 }
 
 bool loadOverlayList(Common::SeekableReadStream &in) {
@@ -289,7 +289,7 @@
 	for (int i = 0; i < size; i++) {
 		loadOverlayFromSave(in);
 	}
-	return !in.ioFailed();
+	return !(in.eos() || in.err());
 }
 
 bool loadSeqList(Common::SeekableReadStream &in) {
@@ -312,14 +312,14 @@
 		tmp.var1E  = in.readSint16BE();
 		seqList.push_back(tmp);
 	}
-	return !in.ioFailed();
+	return !(in.eos() || in.err());
 }
 
 bool loadZoneQuery(Common::SeekableReadStream &in) {
 	for (int i = 0; i < 16; i++) {
 		zoneQuery[i] = in.readUint16BE();
 	}
-	return !in.ioFailed();
+	return !(in.eos() || in.err());
 }
 
 void saveObjectTable(Common::OutSaveFile &out) {
@@ -632,7 +632,7 @@
 		warning("loadTempSaveOS: Loaded the savefile but didn't exhaust it completely. Something was left over");
 	}
 
-	return !in.ioFailed();
+	return !(in.eos() || in.err());
 }
 
 bool CineEngine::loadPlainSaveFW(Common::SeekableReadStream &in, CineSaveGameFormat saveGameFormat) {
@@ -755,7 +755,7 @@
 		}
 	}
 
-	return !in.ioFailed();
+	return !(in.eos() || in.err());
 }
 
 bool CineEngine::makeLoad(char *saveName) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.