diff options
| author | Max Horn | 2010-06-15 12:11:30 +0000 |
|---|---|---|
| committer | Max Horn | 2010-06-15 12:11:30 +0000 |
| commit | 8c06425ee3cac66469c817ab96cd0ab3688cdae6 (patch) | |
| tree | 49f835d4060de5f435d7f19c8a70a5955a0e56da /engines/sci/resource_intern.h | |
| parent | 17a51121623a971b249cd33a8b581fe44b3e5616 (diff) | |
| download | scummvm-rg350-8c06425ee3cac66469c817ab96cd0ab3688cdae6.tar.gz scummvm-rg350-8c06425ee3cac66469c817ab96cd0ab3688cdae6.tar.bz2 scummvm-rg350-8c06425ee3cac66469c817ab96cd0ab3688cdae6.zip | |
SCI: Remove 'map' param from addSource, and let AudioVolumeResourceSource subclass VolumeResourceSource
svn-id: r49814
Diffstat (limited to 'engines/sci/resource_intern.h')
| -rw-r--r-- | engines/sci/resource_intern.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/engines/sci/resource_intern.h b/engines/sci/resource_intern.h index c3642cda1b..e0d7cdcf87 100644 --- a/engines/sci/resource_intern.h +++ b/engines/sci/resource_intern.h @@ -56,7 +56,7 @@ public: bool scanned; const Common::FSNode *resourceFile; int volume_number; - ResourceSource *associated_map; + ResourceSource *associated_map; // TODO: Move to VolumeResourceSource uint32 audioCompressionType; int32 *audioCompressionOffsetMapping; Common::MacResManager *_macResMan; @@ -82,7 +82,10 @@ public: class VolumeResourceSource : public ResourceSource { public: - VolumeResourceSource(const Common::String &name) : ResourceSource(kSourceVolume, name) {} + VolumeResourceSource(const Common::String &name, ResourceSource *map, ResSourceType type = kSourceVolume) + : ResourceSource(type, name) { + associated_map = map; + } }; class ExtMapResourceSource : public ResourceSource { @@ -95,9 +98,11 @@ public: IntMapResourceSource(const Common::String &name) : ResourceSource(kSourceIntMap, name) {} }; -class AudioVolumeResourceSource : public ResourceSource { +class AudioVolumeResourceSource : public VolumeResourceSource { public: - AudioVolumeResourceSource(const Common::String &name) : ResourceSource(kSourceAudioVolume, name) {} + AudioVolumeResourceSource(const Common::String &name, ResourceSource *map) + : VolumeResourceSource(name, map, kSourceAudioVolume) { + } }; class ExtAudioMapResourceSource : public ResourceSource { |