aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/resource_audio.cpp
diff options
context:
space:
mode:
authorMax Horn2010-06-16 00:24:16 +0000
committerMax Horn2010-06-16 00:24:16 +0000
commite7275161f431d0025a7e2bb47bc2d442670fd155 (patch)
treede44bd2032b708a5b77e20ed23516814da6a0547 /engines/sci/resource_audio.cpp
parent81926f106abce4d73a899962a7a1f3fd0307ff40 (diff)
downloadscummvm-rg350-e7275161f431d0025a7e2bb47bc2d442670fd155.tar.gz
scummvm-rg350-e7275161f431d0025a7e2bb47bc2d442670fd155.tar.bz2
scummvm-rg350-e7275161f431d0025a7e2bb47bc2d442670fd155.zip
SCI: Avoid using g_sci in resman (as it might not yet be inited)
svn-id: r49897
Diffstat (limited to 'engines/sci/resource_audio.cpp')
-rw-r--r--engines/sci/resource_audio.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index fc30047e1c..c98b5387be 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -34,7 +34,7 @@
namespace Sci {
-AudioVolumeResourceSource::AudioVolumeResourceSource(const Common::String &name, ResourceSource *map, int volNum)
+AudioVolumeResourceSource::AudioVolumeResourceSource(ResourceManager *resMan, const Common::String &name, ResourceSource *map, int volNum)
: VolumeResourceSource(name, map, volNum, kSourceAudioVolume) {
_audioCompressionType = 0;
@@ -46,7 +46,7 @@ AudioVolumeResourceSource::AudioVolumeResourceSource(const Common::String &name,
* table for later usage.
*/
- Common::SeekableReadStream *fileStream = getVolumeFile(0);
+ Common::SeekableReadStream *fileStream = getVolumeFile(resMan, 0);
if (!fileStream)
return;
@@ -439,7 +439,7 @@ void ResourceManager::setAudioLanguage(int language) {
const char *dot = strrchr(name.c_str(), '.');
int number = atoi(dot + 1);
- addSource(new AudioVolumeResourceSource(name, _audioMapSCI1, number));
+ addSource(new AudioVolumeResourceSource(this, name, _audioMapSCI1, number));
}
scanNewSources();