aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/resource.h
diff options
context:
space:
mode:
authorMax Horn2010-06-15 12:13:29 +0000
committerMax Horn2010-06-15 12:13:29 +0000
commitd4f16962d03f7b1e88ea76560801f2f77a20ebd1 (patch)
tree35bd2a6585d3e0cbdcf7b1ff3062c8d835445957 /engines/sci/resource.h
parentd0f59edd96025cce257e6d39cbc60fed25809279 (diff)
downloadscummvm-rg350-d4f16962d03f7b1e88ea76560801f2f77a20ebd1.tar.gz
scummvm-rg350-d4f16962d03f7b1e88ea76560801f2f77a20ebd1.tar.bz2
scummvm-rg350-d4f16962d03f7b1e88ea76560801f2f77a20ebd1.zip
SCI: Move code from ResourceManager::loadResource to ResourceSource::loadResource
svn-id: r49819
Diffstat (limited to 'engines/sci/resource.h')
-rw-r--r--engines/sci/resource.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index fa5d757def..89af97df7e 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -166,6 +166,7 @@ class Resource {
// FIXME: These 'friend' declarations are meant to be a temporary hack to
// ease transition to the ResourceSource class system.
+ friend class ResourceSource;
friend class MacResourceForkResourceSource;
public:
@@ -201,6 +202,7 @@ typedef Common::HashMap<ResourceId, Resource *, ResourceIdHash, ResourceIdEqualT
class ResourceManager {
// FIXME: These 'friend' declarations are meant to be a temporary hack to
// ease transition to the ResourceSource class system.
+ friend class ResourceSource;
friend class DirectoryResourceSource;
friend class ExtMapResourceSource;
friend class IntMapResourceSource;