aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/resource.h
diff options
context:
space:
mode:
authorWalter van Niftrik2009-06-08 12:20:36 +0000
committerWalter van Niftrik2009-06-08 12:20:36 +0000
commitf2fe13b064731a494275ae4858c02a321468544d (patch)
treedc9be9412d69792ca9d2b879755cf0fe9f844f11 /engines/sci/resource.h
parent60f5ac33009f64e906f1ec3e9480c1665098c679 (diff)
downloadscummvm-rg350-f2fe13b064731a494275ae4858c02a321468544d.tar.gz
scummvm-rg350-f2fe13b064731a494275ae4858c02a321468544d.tar.bz2
scummvm-rg350-f2fe13b064731a494275ae4858c02a321468544d.zip
SCI: Cleanup
svn-id: r41368
Diffstat (limited to 'engines/sci/resource.h')
-rw-r--r--engines/sci/resource.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index 172817912e..fc3f37f25c 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -272,7 +272,7 @@ public:
protected:
int _maxMemory; //!< Config option: Maximum total byte number allocated
- ResourceSource *_sources;
+ Common::List<ResourceSource *> _sources;
int _memoryLocked; //!< Amount of resource bytes in locked memory
int _memoryLRU; //!< Amount of resource bytes under LRU control
Common::List<Resource *> _LRU; //!< Last Resource Used list
@@ -316,16 +316,16 @@ protected:
* used during startup. May be NULL.
* @return One of SCI_ERROR_*.
*/
- int scanNewSources(ResourceSource *source);
+ void scanNewSources();
int addAppropriateSources();
int addInternalSources();
- void freeResourceSources(ResourceSource *rss);
+ void freeResourceSources();
Common::File *getVolumeFile(const char *filename);
void loadResource(Resource *res);
bool loadPatch(Resource *res, Common::File &file);
bool loadFromPatchFile(Resource *res);
- bool loadFromAudioVolume(Resource *res);
+ bool loadFromAudioVolume(Resource *res, Common::File &file);
void freeOldResources(int last_invulnerable);
int decompress(Resource *res, Common::File *file);
int readResourceInfo(Resource *res, Common::File *file, uint32&szPacked, ResourceCompression &compression);