diff options
author | Gregory Montoir | 2004-08-06 17:01:58 +0000 |
---|---|---|
committer | Gregory Montoir | 2004-08-06 17:01:58 +0000 |
commit | 8b0e9502ec706cc82b05c216801ac0fd0a46d7fd (patch) | |
tree | 201a203c69f6285e8e91d4e00f3790721d5986ee /queen/resource.h | |
parent | a7b610b25b5035962e5ee27610e49c1a5d2e5172 (diff) | |
download | scummvm-rg350-8b0e9502ec706cc82b05c216801ac0fd0a46d7fd.tar.gz scummvm-rg350-8b0e9502ec706cc82b05c216801ac0fd0a46d7fd.tar.bz2 scummvm-rg350-8b0e9502ec706cc82b05c216801ac0fd0a46d7fd.zip |
cleanup and simplify Resource class a bit more
svn-id: r14488
Diffstat (limited to 'queen/resource.h')
-rw-r--r-- | queen/resource.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/queen/resource.h b/queen/resource.h index 9db232f2d6..9d32c175be 100644 --- a/queen/resource.h +++ b/queen/resource.h @@ -77,15 +77,13 @@ private: class Resource { public: - Resource(const Common::String &datafilePath); - ~Resource(void); + Resource(); + ~Resource(); - uint8 *loadFile(const char *filename, uint32 skipBytes = 0, byte *dstBuf = NULL); - uint8 *loadFileMalloc(const char *filename, uint32 skipBytes = 0, byte *dstBuf = NULL); + uint8 *loadFile(const char *filename, uint32 skipBytes = 0, uint32 *size = NULL, bool useMalloc = false); bool fileExists(const char *filename) const { return resourceEntry(filename) != NULL; } - uint32 fileSize(const char *filename) const { return resourceEntry(filename)->size; } - File *giveCompressedSound(const char *filename); + File *giveCompressedSound(const char *filename, uint32 *size); bool isDemo() const { return !strcmp(_versionString, "PE100"); } bool isInterview() const { return !strcmp(_versionString, "PEint"); } @@ -104,9 +102,7 @@ public: protected: File *_resourceFile; uint8 _compression; - const Common::String _datafilePath; char _versionString[6]; - const char *_savePath; uint32 _resourceEntries; ResourceEntry *_resourceTable; |