diff options
author | Max Horn | 2010-06-15 12:18:57 +0000 |
---|---|---|
committer | Max Horn | 2010-06-15 12:18:57 +0000 |
commit | 335e17af012590a68ae16ed60eff6fda221a1dce (patch) | |
tree | c38ee342a8eefe7171a05af394b5c2d1ceb2a20c /engines/sci/resource.h | |
parent | 63d9cfb3bf0eb252838ad30946fa8cf51921124b (diff) | |
download | scummvm-rg350-335e17af012590a68ae16ed60eff6fda221a1dce.tar.gz scummvm-rg350-335e17af012590a68ae16ed60eff6fda221a1dce.tar.bz2 scummvm-rg350-335e17af012590a68ae16ed60eff6fda221a1dce.zip |
SCI: Move several methods from ResourceManager to Resource
svn-id: r49833
Diffstat (limited to 'engines/sci/resource.h')
-rw-r--r-- | engines/sci/resource.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/sci/resource.h b/engines/sci/resource.h index 09d87eb9e3..85e03d3a4c 100644 --- a/engines/sci/resource.h +++ b/engines/sci/resource.h @@ -192,6 +192,12 @@ public: void writeToStream(Common::WriteStream *stream) const; uint32 getAudioCompressionType() const; + bool loadPatch(Common::SeekableReadStream *file); + bool loadFromPatchFile(); + bool loadFromWaveFile(Common::SeekableReadStream *file); + bool loadFromAudioVolumeSCI1(Common::SeekableReadStream *file); + bool loadFromAudioVolumeSCI11(Common::SeekableReadStream *file); + protected: int32 _fileOffset; /**< Offset in file */ ResourceStatus _status; @@ -386,11 +392,6 @@ protected: Common::SeekableReadStream *getVolumeFile(ResourceSource *source); void loadResource(Resource *res); - bool loadPatch(Resource *res, Common::SeekableReadStream *file); - bool loadFromPatchFile(Resource *res); - 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); |