[Scummvm-cvs-logs] SF.net SVN: scummvm:[34551] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 34551
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34551&view=rev
Author:   lordhoto
Date:     2008-09-14 23:14:38 +0000 (Sun, 14 Sep 2008)

Log Message:
-----------
Fixed regression introduced with latest stream changes (it seems compressed savefiles ioFailed never returned true when only eos was set).

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/saveload_hof.cpp
    scummvm/trunk/engines/kyra/saveload_lok.cpp
    scummvm/trunk/engines/kyra/saveload_mr.cpp

Modified: scummvm/trunk/engines/kyra/saveload_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_hof.cpp	2008-09-14 22:44:49 UTC (rev 34550)
+++ scummvm/trunk/engines/kyra/saveload_hof.cpp	2008-09-14 23:14:38 UTC (rev 34551)
@@ -118,7 +118,7 @@
 	out->finalize();
 
 	// check for errors
-	if (out->ioFailed())
+	if (out->err())
 		warning("Can't write file '%s'. (Disk full?)", fileName);
 	else
 		debugC(1, kDebugLevelMain, "Saved game '%s.'", saveName);
@@ -279,7 +279,7 @@
 	_sceneExit3 = in.readUint16();
 	_sceneExit4 = in.readUint16();
 
-	if (saveFile->ioFailed())
+	if (saveFile->err())
 		error("Load failed ('%s', '%s').", fileName, header.description.c_str());
 	else
 		debugC(1, kDebugLevelMain, "Loaded savegame '%s.'", header.description.c_str());

Modified: scummvm/trunk/engines/kyra/saveload_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_lok.cpp	2008-09-14 22:44:49 UTC (rev 34550)
+++ scummvm/trunk/engines/kyra/saveload_lok.cpp	2008-09-14 23:14:38 UTC (rev 34551)
@@ -206,7 +206,7 @@
 	_mousePressFlag = false;
 	setMousePos(brandonX, brandonY);
 	
-	if (in->ioFailed())
+	if (in->err())
 		error("Load failed ('%s', '%s').", fileName, header.description.c_str());
 	else
 		debugC(1, kDebugLevelMain, "Loaded savegame '%s.'", header.description.c_str());
@@ -289,7 +289,7 @@
 	out->finalize();
 
 	// check for errors
-	if (out->ioFailed())
+	if (out->err())
 		warning("Can't write file '%s'. (Disk full?)", fileName);
 	else
 		debugC(1, kDebugLevelMain, "Saved game '%s.'", saveName);

Modified: scummvm/trunk/engines/kyra/saveload_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_mr.cpp	2008-09-14 22:44:49 UTC (rev 34550)
+++ scummvm/trunk/engines/kyra/saveload_mr.cpp	2008-09-14 23:14:38 UTC (rev 34551)
@@ -112,7 +112,7 @@
 	out->finalize();
 
 	// check for errors
-	if (out->ioFailed())
+	if (out->err())
 		warning("Can't write file '%s'. (Disk full?)", fileName);
 	else
 		debugC(1, kDebugLevelMain, "Saved game '%s.'", saveName);
@@ -283,7 +283,7 @@
 	_sceneExit3 = in.readUint16();
 	_sceneExit4 = in.readUint16();
 
-	if (saveFile->ioFailed())
+	if (saveFile->err())
 		error("Load failed ('%s', '%s').", fileName, header.description.c_str());
 	else
 		debugC(1, kDebugLevelMain, "Loaded savegame '%s.'", header.description.c_str());


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