diff options
author | Filippos Karapetis | 2010-06-02 13:17:36 +0000 |
---|---|---|
committer | Filippos Karapetis | 2010-06-02 13:17:36 +0000 |
commit | af3fec8c26d92005b507dca65d1d50f820feb0e7 (patch) | |
tree | 491490e7139bd6f214d35e2e152d93a2e11cdfb2 /engines/sci/resource.h | |
parent | 4493080220a98d596ee578bddc8a64c0d3955eac (diff) | |
download | scummvm-rg350-af3fec8c26d92005b507dca65d1d50f820feb0e7.tar.gz scummvm-rg350-af3fec8c26d92005b507dca65d1d50f820feb0e7.tar.bz2 scummvm-rg350-af3fec8c26d92005b507dca65d1d50f820feb0e7.zip |
- Fixed findGameObject() to properly handle SCI0-SCI1 games where the first block of script 0 isn't the exports block
- Changed many places where Common::File is used directly to use Common::SeekableReadStream instead (in order to ultimately remove the SCI_detection hack in the fallback detector)
svn-id: r49391
Diffstat (limited to 'engines/sci/resource.h')
-rw-r--r-- | engines/sci/resource.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/resource.h b/engines/sci/resource.h index 65717e4124..f722ca5768 100644 --- a/engines/sci/resource.h +++ b/engines/sci/resource.h @@ -395,11 +395,11 @@ protected: Common::File *getVolumeFile(const char *filename); void loadResource(Resource *res); - bool loadPatch(Resource *res, Common::File &file); + bool loadPatch(Resource *res, Common::SeekableReadStream *file); bool loadFromPatchFile(Resource *res); - bool loadFromWaveFile(Resource *res, Common::File &file); - bool loadFromAudioVolumeSCI1(Resource *res, Common::File &file); - bool loadFromAudioVolumeSCI11(Resource *res, Common::File &file); + bool loadFromWaveFile(Resource *res, Common::SeekableReadStream *file); + bool loadFromAudioVolumeSCI1(Resource *res, Common::SeekableReadStream *file); + bool loadFromAudioVolumeSCI11(Resource *res, Common::SeekableReadStream *file); void freeOldResources(); int decompress(Resource *res, Common::SeekableReadStream *file); int readResourceInfo(Resource *res, Common::SeekableReadStream *file, uint32&szPacked, ResourceCompression &compression); |