aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/resource_intern.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sci/resource_intern.h')
-rw-r--r--engines/sci/resource_intern.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/resource_intern.h b/engines/sci/resource_intern.h
index c58fc72ff2..209f3720b1 100644
--- a/engines/sci/resource_intern.h
+++ b/engines/sci/resource_intern.h
@@ -56,7 +56,6 @@ public:
bool _scanned;
const Common::FSNode * const _resourceFile;
const int _volumeNumber;
- ResourceSource *_associatedMap; // TODO: Move to VolumeResourceSource
protected:
ResourceSource(ResSourceType type, const Common::String &name, int volNum = 0, const Common::FSNode *resFile = 0);
@@ -105,15 +104,16 @@ public:
};
class VolumeResourceSource : public ResourceSource {
+protected:
+ ResourceSource * const _associatedMap;
+
public:
VolumeResourceSource(const Common::String &name, ResourceSource *map, int volNum, ResSourceType type = kSourceVolume)
- : ResourceSource(type, name, volNum) {
- _associatedMap = map;
+ : ResourceSource(type, name, volNum), _associatedMap(map) {
}
VolumeResourceSource(const Common::String &name, ResourceSource *map, int volNum, const Common::FSNode *resFile)
- : ResourceSource(kSourceVolume, name, volNum, resFile) {
- _associatedMap = map;
+ : ResourceSource(kSourceVolume, name, volNum, resFile), _associatedMap(map) {
}
virtual ResourceSource *findVolume(ResourceSource *map, int volNum) {