From 335e17af012590a68ae16ed60eff6fda221a1dce Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 15 Jun 2010 12:18:57 +0000
Subject: SCI: Move several methods from ResourceManager to Resource

svn-id: r49833
---
 engines/sci/resource.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'engines/sci/resource.h')

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);
-- 
cgit v1.2.3