diff options
Diffstat (limited to 'scumm/scumm.h')
| -rw-r--r-- | scumm/scumm.h | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index d882cef6a2..ee564405ee 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -554,7 +554,7 @@ public: /* Should be in Resource class */ byte _encbyte; - void *_fileHandle; + File _fileHandle; char *_resFilePrefix, *_resFilePath; uint32 _fileOffset; char *_exe_name; @@ -597,9 +597,6 @@ public: virtual void loadCharset(int i); void nukeCharset(int i); - bool fileReadFailed(void *handle); - void clearFileReadFailed(void *handle); - int _lastLoadedRoom, _roomResource; byte _resFilePathId, _fileReadFailed; byte *findResourceData(uint32 tag, byte *ptr); @@ -933,34 +930,14 @@ public: bool _keepText; - /* Should be in System class */ - void fileClose(void *file); - void *fileOpen(const char *filename, int mode); - void fileSeek(void *file, long offs, int whence); - void fileRead(void *handle, void *ptr, uint32 size); - bool fileEof(void *handle); - uint32 filePos(void *handle); bool checkFixedDisk(); int _cdrom; - int fileReadByte(); - uint32 fileReadDwordLE(); - uint32 fileReadDwordBE(); - int fileReadByte(void *handle); - uint32 fileReadDwordLE(void *handle); - uint32 fileReadDwordBE(void *handle); - #if defined(SCUMM_LITTLE_ENDIAN) - uint32 fileReadDword() { return fileReadDwordLE(); } - uint32 fileReadDword(void *handle) { return fileReadDwordLE(handle); } + uint32 fileReadDword() { return _fileHandle.readDwordLE(); } #elif defined(SCUMM_BIG_ENDIAN) - uint32 fileReadDword() { return fileReadDwordBE(); } - uint32 fileReadDword(void *handle) { return fileReadDwordBE(handle); } + uint32 fileReadDword() { return _fileHandle.readDwordBE(); } #endif - uint fileReadWordLE(); - uint fileReadWordBE(); - uint fileReadWordLE(void *handle); - uint fileReadWordBE(void *handle); /* Version 5 script opcodes */ void o5_actorFollowCamera(); |