[Scummvm-cvs-logs] SF.net SVN: scummvm:[40725] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue May 19 13:42:14 CEST 2009
Revision: 40725
http://scummvm.svn.sourceforge.net/scummvm/?rev=40725&view=rev
Author: fingolfin
Date: 2009-05-19 11:42:14 +0000 (Tue, 19 May 2009)
Log Message:
-----------
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)
Modified Paths:
--------------
scummvm/trunk/backends/saves/savefile.cpp
scummvm/trunk/common/config-file.cpp
scummvm/trunk/common/config-manager.cpp
scummvm/trunk/common/file.cpp
scummvm/trunk/common/file.h
scummvm/trunk/common/stream.h
scummvm/trunk/common/unzip.cpp
scummvm/trunk/engines/agi/preagi_mickey.cpp
scummvm/trunk/engines/agi/preagi_winnie.cpp
scummvm/trunk/engines/agi/saveload.cpp
scummvm/trunk/engines/cine/saveload.cpp
scummvm/trunk/engines/cruise/saveload.cpp
scummvm/trunk/engines/drascula/saveload.cpp
scummvm/trunk/engines/gob/saveload.cpp
scummvm/trunk/engines/kyra/saveload.cpp
scummvm/trunk/engines/queen/queen.cpp
scummvm/trunk/engines/saga/saveload.cpp
scummvm/trunk/engines/sky/control.cpp
scummvm/trunk/engines/sky/detection.cpp
scummvm/trunk/engines/sword1/control.cpp
scummvm/trunk/engines/sword2/saveload.cpp
scummvm/trunk/engines/tinsel/saveload.cpp
scummvm/trunk/engines/touche/saveload.cpp
scummvm/trunk/engines/tucker/saveload.cpp
scummvm/trunk/graphics/font.cpp
scummvm/trunk/sound/softsynth/mt32.cpp
Modified: scummvm/trunk/backends/saves/savefile.cpp
===================================================================
--- scummvm/trunk/backends/saves/savefile.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/backends/saves/savefile.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -50,14 +50,14 @@
if (buffer && outFile) {
inFile->read(buffer, size);
- bool error = inFile->ioFailed();
+ bool error = inFile->err();
delete inFile;
inFile = 0;
if (!error) {
outFile->write(buffer, size);
outFile->finalize();
- if (!outFile->ioFailed()) {
+ if (!outFile->err()) {
success = removeSavefile(oldFilename);
}
}
Modified: scummvm/trunk/common/config-file.cpp
===================================================================
--- scummvm/trunk/common/config-file.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/common/config-file.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -87,7 +87,7 @@
// TODO: Detect if a section occurs multiple times (or likewise, if
// a key occurs multiple times inside one section).
- while (!stream.eos() && !stream.ioFailed()) {
+ while (!stream.eos() && !stream.err()) {
lineno++;
// Read a line
@@ -179,7 +179,7 @@
if (!section.name.empty())
_sections.push_back(section);
- return (!stream.ioFailed() || stream.eos());
+ return (!stream.err() || stream.eos());
}
bool ConfigFile::saveToFile(const String &filename) {
@@ -232,7 +232,7 @@
}
stream.flush();
- return !stream.ioFailed();
+ return !stream.err();
}
Modified: scummvm/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/common/config-manager.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -114,7 +114,7 @@
// TODO: Detect if a domain occurs multiple times (or likewise, if
// a key occurs multiple times inside one domain).
- while (!stream.eos() && !stream.ioFailed()) {
+ while (!stream.eos() && !stream.err()) {
lineno++;
// Read a line
Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/common/file.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -58,10 +58,8 @@
assert(!filename.empty());
assert(!_handle);
- clearIOFailed();
-
SeekableReadStream *stream = 0;
-
+
if ((stream = archive.createReadStreamForMember(filename))) {
debug(3, "Opening hashed: %s", filename.c_str());
} else if ((stream = archive.createReadStreamForMember(filename + "."))) {
@@ -90,7 +88,6 @@
bool File::open(SeekableReadStream *stream, const Common::String &name) {
assert(!_handle);
- clearIOFailed();
if (stream) {
_handle = stream;
@@ -124,13 +121,12 @@
}
bool File::ioFailed() const {
- // TODO/FIXME: Just use ferror() here?
- return !_handle || _handle->ioFailed();
+ return !_handle || (eos() || err());
}
void File::clearIOFailed() {
if (_handle)
- _handle->clearIOFailed();
+ _handle->clearErr();
}
bool File::err() const {
@@ -211,12 +207,12 @@
bool DumpFile::err() const {
assert(_handle);
- return _handle->ioFailed();
+ return _handle->err();
}
void DumpFile::clearErr() {
assert(_handle);
- _handle->clearIOFailed();
+ _handle->clearErr();
}
uint32 DumpFile::write(const void *ptr, uint32 len) {
Modified: scummvm/trunk/common/file.h
===================================================================
--- scummvm/trunk/common/file.h 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/common/file.h 2009-05-19 11:42:14 UTC (rev 40725)
@@ -126,16 +126,27 @@
*/
const char *getName() const { return _name.c_str(); }
+ /**
+ * DEPRECATED: Use err() or eos() instead.
+ * Returns true if any I/O failure occurred or the end of the
+ * stream was reached while reading.
+ */
bool ioFailed() const;
+
+ /**
+ * DEPRECATED: Don't use this unless you are still using ioFailed().
+ * Reset the I/O error status.
+ */
void clearIOFailed();
- bool err() const;
- void clearErr();
- bool eos() const;
- virtual int32 pos() const;
- virtual int32 size() const;
- bool seek(int32 offs, int whence = SEEK_SET);
- uint32 read(void *dataPtr, uint32 dataSize);
+ bool err() const; // implement abstract Stream method
+ void clearErr(); // implement abstract Stream method
+ bool eos() const; // implement abstract SeekableReadStream method
+
+ int32 pos() const; // implement abstract SeekableReadStream method
+ int32 size() const; // implement abstract SeekableReadStream method
+ bool seek(int32 offs, int whence = SEEK_SET); // implement abstract SeekableReadStream method
+ uint32 read(void *dataPtr, uint32 dataSize); // implement abstract SeekableReadStream method
};
Modified: scummvm/trunk/common/stream.h
===================================================================
--- scummvm/trunk/common/stream.h 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/common/stream.h 2009-05-19 11:42:14 UTC (rev 40725)
@@ -41,19 +41,6 @@
virtual ~Stream() {}
/**
- * DEPRECATED: Use err() or eos() instead.
- * Returns true if any I/O failure occurred or the end of the
- * stream was reached while reading.
- */
- virtual bool ioFailed() const { return err(); }
-
- /**
- * DEPRECATED: Don't use this unless you are still using ioFailed().
- * Reset the I/O error status.
- */
- virtual void clearIOFailed() { clearErr(); }
-
- /**
* Returns true if an I/O failure occurred.
* This flag is never cleared automatically. In order to clear it,
* client code has to call clearErr() explicitly.
@@ -405,7 +392,7 @@
* Upon successful completion, return a string with the content
* of the line, *without* the end of a line marker. This method
* does not indicate whether an error occured. Callers must use
- * ioFailed() or eos() to determine whether an exception occurred.
+ * err() or eos() to determine whether an exception occurred.
*/
virtual String readLine();
};
@@ -509,8 +496,6 @@
~BufferedReadStream();
virtual bool eos() const { return (_pos == _bufSize) && _parentStream->eos(); }
- virtual bool ioFailed() const { return _parentStream->ioFailed(); }
- virtual void clearIOFailed() { _parentStream->clearIOFailed(); }
virtual bool err() const { return _parentStream->err(); }
virtual void clearErr() { _parentStream->clearErr(); }
Modified: scummvm/trunk/common/unzip.cpp
===================================================================
--- scummvm/trunk/common/unzip.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/common/unzip.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -372,7 +372,7 @@
*pi = (int)c;
return UNZ_OK;
} else {
- if (fin.ioFailed())
+ if (fin.err())
return UNZ_ERRNO;
else
return UNZ_EOF;
@@ -385,12 +385,12 @@
*/
static int unzlocal_getShort(Common::SeekableReadStream *fin, uLong *pX) {
*pX = fin->readUint16LE();
- return fin->ioFailed() ? UNZ_ERRNO : UNZ_OK;
+ return (fin->err() || fin->eos()) ? UNZ_ERRNO : UNZ_OK;
}
static int unzlocal_getLong(Common::SeekableReadStream *fin, uLong *pX) {
*pX = fin->readUint32LE();
- return fin->ioFailed() ? UNZ_ERRNO : UNZ_OK;
+ return (fin->err() || fin->eos()) ? UNZ_ERRNO : UNZ_OK;
}
@@ -433,7 +433,7 @@
uLong uPosFound=0;
uSizeFile = fin.size();
- if (fin.ioFailed())
+ if (fin.err())
return 0;
if (uMaxBack>uSizeFile)
@@ -456,7 +456,7 @@
uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
(BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
fin.seek(uReadPos, SEEK_SET);
- if (fin.ioFailed())
+ if (fin.err())
break;
if (fin.read(buf,(uInt)uReadSize)!=uReadSize)
@@ -510,7 +510,7 @@
err=UNZ_ERRNO;
us->_stream->seek(central_pos, SEEK_SET);
- if (us->_stream->ioFailed())
+ if (us->_stream->err())
err=UNZ_ERRNO;
/* the signature, already checked */
@@ -651,7 +651,7 @@
return UNZ_PARAMERROR;
s=(unz_s*)file;
s->_stream->seek(s->pos_in_central_dir+s->byte_before_the_zipfile, SEEK_SET);
- if (s->_stream->ioFailed())
+ if (s->_stream->err())
err=UNZ_ERRNO;
@@ -735,7 +735,7 @@
if (lSeek!=0) {
s->_stream->seek(lSeek, SEEK_CUR);
- if (s->_stream->ioFailed())
+ if (s->_stream->err())
lSeek=0;
else
err=UNZ_ERRNO;
@@ -759,7 +759,7 @@
if (lSeek!=0) {
s->_stream->seek(lSeek, SEEK_CUR);
- if (s->_stream->ioFailed())
+ if (s->_stream->err())
lSeek=0;
else
err=UNZ_ERRNO;
@@ -917,7 +917,7 @@
s->_stream->seek(s->cur_file_info_internal.offset_curfile +
s->byte_before_the_zipfile, SEEK_SET);
- if (s->_stream->ioFailed())
+ if (s->_stream->err())
return UNZ_ERRNO;
@@ -1121,7 +1121,7 @@
return UNZ_EOF;
pfile_in_zip_read_info->_stream->seek(pfile_in_zip_read_info->pos_in_zipfile +
pfile_in_zip_read_info->byte_before_the_zipfile, SEEK_SET);
- if (pfile_in_zip_read_info->_stream->ioFailed())
+ if (pfile_in_zip_read_info->_stream->err())
return UNZ_ERRNO;
if (pfile_in_zip_read_info->_stream->read(pfile_in_zip_read_info->read_buffer,uReadThis)!=uReadThis)
return UNZ_ERRNO;
@@ -1275,7 +1275,7 @@
pfile_in_zip_read_info->_stream->seek(pfile_in_zip_read_info->offset_local_extrafield +
pfile_in_zip_read_info->pos_local_extrafield,SEEK_SET);
- if (pfile_in_zip_read_info->_stream->ioFailed())
+ if (pfile_in_zip_read_info->_stream->err())
return UNZ_ERRNO;
if (pfile_in_zip_read_info->_stream->read(buf,(uInt)size_to_read)!=size_to_read)
@@ -1339,7 +1339,7 @@
uReadThis = s->gi.size_comment;
s->_stream->seek(s->central_pos+22, SEEK_SET);
- if (s->_stream->ioFailed())
+ if (s->_stream->err())
return UNZ_ERRNO;
if (uReadThis>0) {
Modified: scummvm/trunk/engines/agi/preagi_mickey.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_mickey.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/agi/preagi_mickey.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -1127,7 +1127,7 @@
outfile->finalize();
- if (outfile->ioFailed())
+ if (outfile->err())
warning("Can't write file '%s'. (Disk full?)", szFile);
diskerror = false;
Modified: scummvm/trunk/engines/agi/preagi_winnie.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_winnie.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/agi/preagi_winnie.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -1161,7 +1161,7 @@
outfile->finalize();
- if (outfile->ioFailed())
+ if (outfile->err())
warning("Can't write file '%s'. (Disk full?)", szFile);
delete outfile;
Modified: scummvm/trunk/engines/agi/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agi/saveload.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/agi/saveload.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -225,7 +225,7 @@
out->writeSint16BE(_gfx->getAGIPalFileNum());
out->finalize();
- if (out->ioFailed()) {
+ if (out->err()) {
warning("Can't write file '%s'. (Disk full?)", fileName);
result = errIOError;
} else
Modified: scummvm/trunk/engines/cine/saveload.cpp
===================================================================
--- scummvm/trunk/engines/cine/saveload.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/cine/saveload.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -42,7 +42,7 @@
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) {
Modified: scummvm/trunk/engines/cruise/saveload.cpp
===================================================================
--- scummvm/trunk/engines/cruise/saveload.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/cruise/saveload.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -770,7 +770,7 @@
header.saveName = saveName;
writeSavegameHeader(f, header);
- if (f->ioFailed()) {
+ if (f->err()) {
delete f;
saveMan->removeSavefile(filename);
return Common::kWritingFailed;
Modified: scummvm/trunk/engines/drascula/saveload.cpp
===================================================================
--- scummvm/trunk/engines/drascula/saveload.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/drascula/saveload.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -253,7 +253,7 @@
out->writeSint32LE(pickedObject);
out->finalize();
- if (out->ioFailed())
+ if (out->err())
warning("Can't write file '%s'. (Disk full?)", gameName);
delete out;
Modified: scummvm/trunk/engines/gob/saveload.cpp
===================================================================
--- scummvm/trunk/engines/gob/saveload.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/gob/saveload.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -234,7 +234,7 @@
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 @@
if (result) {
out->finalize();
- if (out->ioFailed()) {
+ if (out->err()) {
warning("Can't write to file \"%s\"", _name);
result = false;
}
Modified: scummvm/trunk/engines/kyra/saveload.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/kyra/saveload.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -197,7 +197,7 @@
else
out->writeUint32BE(GF_FLOPPY);
- if (out->ioFailed()) {
+ if (out->err()) {
warning("Can't write file '%s'. (Disk full?)", filename);
delete out;
return 0;
Modified: scummvm/trunk/engines/queen/queen.cpp
===================================================================
--- scummvm/trunk/engines/queen/queen.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/queen/queen.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -344,7 +344,7 @@
file->finalize();
// check for errors
- if (file->ioFailed()) {
+ if (file->err()) {
warning("Can't write file '%s'. (Disk full?)", name);
err = Common::kWritingFailed;
}
Modified: scummvm/trunk/engines/saga/saveload.cpp
===================================================================
--- scummvm/trunk/engines/saga/saveload.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/saga/saveload.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -247,7 +247,7 @@
out->finalize();
- if (out->ioFailed())
+ if (out->err())
warning("Can't write file '%s'. (Disk full?)", fileName);
delete out;
Modified: scummvm/trunk/engines/sky/control.cpp
===================================================================
--- scummvm/trunk/engines/sky/control.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/sky/control.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -1087,7 +1087,7 @@
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 @@
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 @@
uint32 writeRes = outf->write(saveData, fSize);
outf->finalize();
- if (outf->ioFailed())
+ if (outf->err())
writeRes = 0;
free(saveData);
delete outf;
Modified: scummvm/trunk/engines/sky/detection.cpp
===================================================================
--- scummvm/trunk/engines/sky/detection.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/sky/detection.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -262,7 +262,7 @@
outf->write(savenames[cnt].c_str(), savenames[cnt].size() + 1);
}
outf->finalize();
- if (!outf->ioFailed())
+ if (!outf->err())
ioFailed = false;
delete outf;
}
Modified: scummvm/trunk/engines/sword1/control.cpp
===================================================================
--- scummvm/trunk/engines/sword1/control.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/sword1/control.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -1140,7 +1140,7 @@
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 @@
newSave->write(saveData, dataSize);
newSave->finalize();
- if (newSave->ioFailed())
+ if (newSave->err())
warning("Couldn't write to file '%s'. Device full?", newFileName);
delete newSave;
Modified: scummvm/trunk/engines/sword2/saveload.cpp
===================================================================
--- scummvm/trunk/engines/sword2/saveload.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/sword2/saveload.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -140,7 +140,7 @@
out->write(buffer, bufferSize);
out->finalize();
- if (!out->ioFailed()) {
+ if (!out->err()) {
delete out;
return SR_OK;
}
Modified: scummvm/trunk/engines/tinsel/saveload.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/saveload.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/tinsel/saveload.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -484,7 +484,7 @@
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 @@
// Write out the special Id for Discworld savegames
f->writeUint32LE(0xFEEDFACE);
- if (f->ioFailed())
+ if (f->err())
goto save_failure;
f->finalize();
Modified: scummvm/trunk/engines/touche/saveload.cpp
===================================================================
--- scummvm/trunk/engines/touche/saveload.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/touche/saveload.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -334,7 +334,7 @@
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());
Modified: scummvm/trunk/engines/tucker/saveload.cpp
===================================================================
--- scummvm/trunk/engines/tucker/saveload.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/engines/tucker/saveload.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -112,7 +112,7 @@
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;
}
Modified: scummvm/trunk/graphics/font.cpp
===================================================================
--- scummvm/trunk/graphics/font.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/graphics/font.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -649,7 +649,7 @@
cacheFile.writeByte(0);
}
- return !cacheFile.ioFailed();
+ return !cacheFile.err();
}
NewFont *NewFont::loadFromCache(Common::SeekableReadStream &stream) {
Modified: scummvm/trunk/sound/softsynth/mt32.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/mt32.cpp 2009-05-19 11:30:51 UTC (rev 40724)
+++ scummvm/trunk/sound/softsynth/mt32.cpp 2009-05-19 11:42:14 UTC (rev 40725)
@@ -109,7 +109,7 @@
}
bool writeBit8u(MT32Emu::Bit8u out) {
_out.writeByte(out);
- return !_out.ioFailed();
+ return !_out.err();
}
bool isEOF() {
return _in.isOpen() && _in.eos();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list