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

Removed last traces of clearIOFailed. Yay :)

Browse Source 
svn-id: r42910
This commit is contained in:
Max Horn 2009-07-29 21:39:00 +00:00
parent d91d68a9ca
commit 6df25f47c3
4 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/file.cpp
View File

@ -124,11 +124,6 @@ bool File::ioFailed() const {
return !_handle || (eos() || err()); return !_handle || (eos() || err());
} }
void File::clearIOFailed() {
if (_handle)
_handle->clearErr();
}
bool File::err() const { bool File::err() const {
assert(_handle); assert(_handle);
return _handle->err(); return _handle->err();

6
common/file.h
View File

@ -133,12 +133,6 @@ public:
*/ */
bool ioFailed() const; 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; // implement abstract Stream method bool err() const; // implement abstract Stream method
void clearErr(); // implement abstract Stream method void clearErr(); // implement abstract Stream method
bool eos() const; // implement abstract SeekableReadStream method bool eos() const; // implement abstract SeekableReadStream method

2
engines/scumm/resource_v2.cpp
View File

@ -138,7 +138,7 @@ void ScummEngine_v2::readEnhancedIndexFile() {
_fileHandle->seek(_numScripts * 3, SEEK_CUR); _fileHandle->seek(_numScripts * 3, SEEK_CUR);
_numSounds = _fileHandle->readByte(); _numSounds = _fileHandle->readByte();
_fileHandle->clearIOFailed(); _fileHandle->clearErr();
_fileHandle->seek(0, SEEK_SET); _fileHandle->seek(0, SEEK_SET);
readMAXS(0); readMAXS(0);

2
engines/scumm/resource_v3.cpp
View File

@ -80,7 +80,7 @@ void ScummEngine_v3old::readIndexFile() {
_fileHandle->seek(_numScripts * 3, SEEK_CUR); _fileHandle->seek(_numScripts * 3, SEEK_CUR);
_numSounds = _fileHandle->readByte(); _numSounds = _fileHandle->readByte();
_fileHandle->clearIOFailed(); _fileHandle->clearErr();
_fileHandle->seek(0, SEEK_SET); _fileHandle->seek(0, SEEK_SET);
readMAXS(0); readMAXS(0);