diff options
author | Max Horn | 2009-05-19 11:42:14 +0000 |
---|---|---|
committer | Max Horn | 2009-05-19 11:42:14 +0000 |
commit | 65b5d318140c7ff846455a37ec7ae63e635bcdcf (patch) | |
tree | 77f278ceec1e54e097056df0b2820e414eed8290 /engines | |
parent | 4d59f620f9fdc1dfd7ccd6c7d30a0b5de480eb20 (diff) | |
download | scummvm-rg350-65b5d318140c7ff846455a37ec7ae63e635bcdcf.tar.gz scummvm-rg350-65b5d318140c7ff846455a37ec7ae63e635bcdcf.tar.bz2 scummvm-rg350-65b5d318140c7ff846455a37ec7ae63e635bcdcf.zip |
COMMON: Removed Stream::ioFailed() and clearIOFailed(), as they are deprecated; however, retained ioFailed in SeekableReadStream and File for now (so for now this mainly affects WriteStream subclasses)
svn-id: r40725
Diffstat (limited to 'engines')
-rw-r--r-- | engines/agi/preagi_mickey.cpp | 2 | ||||
-rw-r--r-- | engines/agi/preagi_winnie.cpp | 2 | ||||
-rw-r--r-- | engines/agi/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/cine/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/cruise/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/drascula/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/gob/saveload.cpp | 4 | ||||
-rw-r--r-- | engines/kyra/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/queen/queen.cpp | 2 | ||||
-rw-r--r-- | engines/saga/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/sky/control.cpp | 6 | ||||
-rw-r--r-- | engines/sky/detection.cpp | 2 | ||||
-rw-r--r-- | engines/sword1/control.cpp | 4 | ||||
-rw-r--r-- | engines/sword2/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/tinsel/saveload.cpp | 4 | ||||
-rw-r--r-- | engines/touche/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/tucker/saveload.cpp | 2 |
17 files changed, 22 insertions, 22 deletions
diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp index 8ebd24e6d9..ca8b47aded 100644 --- a/engines/agi/preagi_mickey.cpp +++ b/engines/agi/preagi_mickey.cpp @@ -1127,7 +1127,7 @@ void Mickey::saveGame() { outfile->finalize(); - if (outfile->ioFailed()) + if (outfile->err()) warning("Can't write file '%s'. (Disk full?)", szFile); diskerror = false; diff --git a/engines/agi/preagi_winnie.cpp b/engines/agi/preagi_winnie.cpp index ab9d59da3e..81305e9590 100644 --- a/engines/agi/preagi_winnie.cpp +++ b/engines/agi/preagi_winnie.cpp @@ -1161,7 +1161,7 @@ void Winnie::saveGame() { outfile->finalize(); - if (outfile->ioFailed()) + if (outfile->err()) warning("Can't write file '%s'. (Disk full?)", szFile); delete outfile; diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp index a27da3053f..54159aa6fa 100644 --- a/engines/agi/saveload.cpp +++ b/engines/agi/saveload.cpp @@ -225,7 +225,7 @@ int AgiEngine::saveGame(const char *fileName, const char *description) { out->writeSint16BE(_gfx->getAGIPalFileNum()); out->finalize(); - if (out->ioFailed()) { + if (out->err()) { warning("Can't write file '%s'. (Disk full?)", fileName); result = errIOError; } else diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp index 2c6ff4dcae..ea0ff0079b 100644 --- a/engines/cine/saveload.cpp +++ b/engines/cine/saveload.cpp @@ -42,7 +42,7 @@ bool writeChunkHeader(Common::OutSaveFile &out, const ChunkHeader &header) { out.writeUint32BE(header.id); out.writeUint32BE(header.version); out.writeUint32BE(header.size); - return !out.ioFailed(); + return !out.err(); } bool loadChunkHeader(Common::SeekableReadStream &in, ChunkHeader &header) { diff --git a/engines/cruise/saveload.cpp b/engines/cruise/saveload.cpp index b9edb2decd..0df77b60e9 100644 --- a/engines/cruise/saveload.cpp +++ b/engines/cruise/saveload.cpp @@ -770,7 +770,7 @@ Common::Error saveSavegameData(int saveGameIdx, const Common::String &saveName) header.saveName = saveName; writeSavegameHeader(f, header); - if (f->ioFailed()) { + if (f->err()) { delete f; saveMan->removeSavefile(filename); return Common::kWritingFailed; diff --git a/engines/drascula/saveload.cpp b/engines/drascula/saveload.cpp index 9745bb93fc..abf17d0e8e 100644 --- a/engines/drascula/saveload.cpp +++ b/engines/drascula/saveload.cpp @@ -253,7 +253,7 @@ void DrasculaEngine::saveGame(char gameName[]) { out->writeSint32LE(pickedObject); out->finalize(); - if (out->ioFailed()) + if (out->err()) warning("Can't write file '%s'. (Disk full?)", gameName); delete out; diff --git a/engines/gob/saveload.cpp b/engines/gob/saveload.cpp index 0788dc70f9..1584cedc95 100644 --- a/engines/gob/saveload.cpp +++ b/engines/gob/saveload.cpp @@ -234,7 +234,7 @@ bool PlainSave::save(int16 dataVar, int32 size, int32 offset, const char *name, variables, variableSizes, _endianness); out->finalize(); - if (out->ioFailed()) { + if (out->err()) { warning("Can't write to file \"%s\"", name); retVal = false; } @@ -494,7 +494,7 @@ bool StagedSave::write() const { if (result) { out->finalize(); - if (out->ioFailed()) { + if (out->err()) { warning("Can't write to file \"%s\"", _name); result = false; } diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index a7187f6c76..f6302d39c1 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -197,7 +197,7 @@ Common::WriteStream *KyraEngine_v1::openSaveForWriting(const char *filename, con else out->writeUint32BE(GF_FLOPPY); - if (out->ioFailed()) { + if (out->err()) { warning("Can't write file '%s'. (Disk full?)", filename); delete out; return 0; diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index 538931634e..6d7f9deda4 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -344,7 +344,7 @@ Common::Error QueenEngine::saveGameState(int slot, const char *desc) { file->finalize(); // check for errors - if (file->ioFailed()) { + if (file->err()) { warning("Can't write file '%s'. (Disk full?)", name); err = Common::kWritingFailed; } diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp index aa10f56a9b..56fb366405 100644 --- a/engines/saga/saveload.cpp +++ b/engines/saga/saveload.cpp @@ -247,7 +247,7 @@ void SagaEngine::save(const char *fileName, const char *saveName) { out->finalize(); - if (out->ioFailed()) + if (out->err()) warning("Can't write file '%s'. (Disk full?)", fileName); delete out; diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp index dde437f268..a24e3eeb04 100644 --- a/engines/sky/control.cpp +++ b/engines/sky/control.cpp @@ -1087,7 +1087,7 @@ void Control::saveDescriptions(const Common::StringList &list) { outf->write(list[cnt].c_str(), list[cnt].size() + 1); } outf->finalize(); - if (!outf->ioFailed()) + if (!outf->err()) ioFailed = false; delete outf; } @@ -1114,7 +1114,7 @@ void Control::doAutoSave(void) { outf->write(saveData, fSize); outf->finalize(); - if (outf->ioFailed()) + if (outf->err()) displayMessage(0, "Unable to write autosave file '%s'. Disk full?", fName, _saveFileMan->popErrorDesc().c_str()); delete outf; @@ -1135,7 +1135,7 @@ uint16 Control::saveGameToFile(void) { uint32 writeRes = outf->write(saveData, fSize); outf->finalize(); - if (outf->ioFailed()) + if (outf->err()) writeRes = 0; free(saveData); delete outf; diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp index 6ad6e651ef..3f01177cec 100644 --- a/engines/sky/detection.cpp +++ b/engines/sky/detection.cpp @@ -262,7 +262,7 @@ void SkyMetaEngine::removeSaveState(const char *target, int slot) const { outf->write(savenames[cnt].c_str(), savenames[cnt].size() + 1); } outf->finalize(); - if (!outf->ioFailed()) + if (!outf->err()) ioFailed = false; delete outf; } diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index e016eaec13..9077e4f8c3 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -1140,7 +1140,7 @@ void Control::saveGameToFile(uint8 slot) { for (uint32 cnt2 = 0; cnt2 < playerSize; cnt2++) outf->writeUint32LE(playerRaw[cnt2]); outf->finalize(); - if (outf->ioFailed()) + if (outf->err()) displayMessage(0, "Couldn't write to file '%s'. Device full? (%s)", fName, _saveFileMan->popErrorDesc().c_str()); delete outf; } @@ -1288,7 +1288,7 @@ bool Control::convertSaveGame(uint8 slot, char* desc) { newSave->write(saveData, dataSize); newSave->finalize(); - if (newSave->ioFailed()) + if (newSave->err()) warning("Couldn't write to file '%s'. Device full?", newFileName); delete newSave; diff --git a/engines/sword2/saveload.cpp b/engines/sword2/saveload.cpp index 4a8b0e9ab6..106bb97275 100644 --- a/engines/sword2/saveload.cpp +++ b/engines/sword2/saveload.cpp @@ -140,7 +140,7 @@ uint32 Sword2Engine::saveData(uint16 slotNo, byte *buffer, uint32 bufferSize) { out->write(buffer, bufferSize); out->finalize(); - if (!out->ioFailed()) { + if (!out->err()) { delete out; return SR_OK; } diff --git a/engines/tinsel/saveload.cpp b/engines/tinsel/saveload.cpp index b17ee93d4d..4d305e15cf 100644 --- a/engines/tinsel/saveload.cpp +++ b/engines/tinsel/saveload.cpp @@ -484,7 +484,7 @@ static void DoSave(void) { memcpy(hdr.desc, SaveSceneDesc, SG_DESC_LEN); hdr.desc[SG_DESC_LEN - 1] = 0; g_system->getTimeAndDate(hdr.dateTime); - if (!syncSaveGameHeader(s, hdr) || f->ioFailed()) { + if (!syncSaveGameHeader(s, hdr) || f->err()) { goto save_failure; } @@ -492,7 +492,7 @@ static void DoSave(void) { // Write out the special Id for Discworld savegames f->writeUint32LE(0xFEEDFACE); - if (f->ioFailed()) + if (f->err()) goto save_failure; f->finalize(); diff --git a/engines/touche/saveload.cpp b/engines/touche/saveload.cpp index 3bbb1253f3..daf9d25ce8 100644 --- a/engines/touche/saveload.cpp +++ b/engines/touche/saveload.cpp @@ -334,7 +334,7 @@ Common::Error ToucheEngine::saveGameState(int num, const char *description) { f->write(headerDescription, kGameStateDescriptionLen); saveGameStateData(f); f->finalize(); - if (!f->ioFailed()) { + if (!f->err()) { saveOk = true; } else { warning("Can't write file '%s'", gameStateFileName.c_str()); diff --git a/engines/tucker/saveload.cpp b/engines/tucker/saveload.cpp index ae16837ddf..2b23cf86e0 100644 --- a/engines/tucker/saveload.cpp +++ b/engines/tucker/saveload.cpp @@ -112,7 +112,7 @@ Common::Error TuckerEngine::saveGameState(int num, const char *description) { f->writeUint16LE(0); saveOrLoadGameStateData(*f); f->finalize(); - if (f->ioFailed()) { + if (f->err()) { warning("Can't write file '%s'", gameStateFileName.c_str()); ret = Common::kWritingFailed; } |