libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-07 17:22:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove ioFailed() usage from Cine engine.

Browse Source 
svn-id: r42502
This commit is contained in:
Kari Salminen 2009-07-15 13:04:17 +00:00
parent baabc623f6
commit 7751cea790
1 changed files with 12 additions and 12 deletions

24
engines/cine/saveload.cpp

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