aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2008-09-14 23:14:38 +0000
committerJohannes Schickel2008-09-14 23:14:38 +0000
commitc1458bd2bb75bacee89ee5b2bd4bbaf059870e08 (patch)
tree3a54a510a831e5caed20694eaa29c271844e83b5 /engines
parentace51b317a6de7d000c70c6643c193642efbc70b (diff)
downloadscummvm-rg350-c1458bd2bb75bacee89ee5b2bd4bbaf059870e08.tar.gz
scummvm-rg350-c1458bd2bb75bacee89ee5b2bd4bbaf059870e08.tar.bz2
scummvm-rg350-c1458bd2bb75bacee89ee5b2bd4bbaf059870e08.zip
Fixed regression introduced with latest stream changes (it seems compressed savefiles ioFailed never returned true when only eos was set).
svn-id: r34551
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/saveload_hof.cpp4
-rw-r--r--engines/kyra/saveload_lok.cpp4
-rw-r--r--engines/kyra/saveload_mr.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/saveload_hof.cpp b/engines/kyra/saveload_hof.cpp
index 2b245f6167..dc7d944cda 100644
--- a/engines/kyra/saveload_hof.cpp
+++ b/engines/kyra/saveload_hof.cpp
@@ -118,7 +118,7 @@ void KyraEngine_HoF::saveGame(const char *fileName, const char *saveName, const
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 @@ void KyraEngine_HoF::loadGame(const char *fileName) {
_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());
diff --git a/engines/kyra/saveload_lok.cpp b/engines/kyra/saveload_lok.cpp
index 257d762ce8..8be5e102cf 100644
--- a/engines/kyra/saveload_lok.cpp
+++ b/engines/kyra/saveload_lok.cpp
@@ -206,7 +206,7 @@ void KyraEngine_LoK::loadGame(const char *fileName) {
_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 @@ void KyraEngine_LoK::saveGame(const char *fileName, const char *saveName, const
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);
diff --git a/engines/kyra/saveload_mr.cpp b/engines/kyra/saveload_mr.cpp
index 8849f99523..07ca5c31f5 100644
--- a/engines/kyra/saveload_mr.cpp
+++ b/engines/kyra/saveload_mr.cpp
@@ -112,7 +112,7 @@ void KyraEngine_MR::saveGame(const char *fileName, const char *saveName, const G
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 @@ void KyraEngine_MR::loadGame(const char *fileName) {
_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());