diff options
| -rw-r--r-- | saga/rscfile.cpp | 8 | ||||
| -rw-r--r-- | saga/sndres.cpp | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/saga/rscfile.cpp b/saga/rscfile.cpp index c4bd242090..381beb823e 100644 --- a/saga/rscfile.cpp +++ b/saga/rscfile.cpp @@ -440,12 +440,18 @@ void Resource::loadGlobalResources(int chapter, int actorsEntrance) { // TODO: close chapter context, or rather reassign it in our case ResourceContext *resourceContext; + ResourceContext *soundContext; resourceContext = _vm->_resource->getContext(GAME_RESOURCEFILE); if (resourceContext == NULL) { error("Resource::loadGlobalResources() resource context not found"); } + soundContext = _vm->_resource->getContext(GAME_SOUNDFILE); + if (soundContext == NULL) { + error("Resource::loadGlobalResources() sound context not found"); + } + byte *resourcePointer; size_t resourceLength; @@ -490,7 +496,7 @@ void Resource::loadGlobalResources(int chapter, int actorsEntrance) { } debug(0, "Going to read %d of %d", chapter, _vm->_sndRes->_fxTableIDs[chapter]); - _vm->_resource->loadResource(resourceContext, _vm->_sndRes->_fxTableIDs[chapter], + _vm->_resource->loadResource(soundContext, _vm->_sndRes->_fxTableIDs[chapter], resourcePointer, resourceLength); if (resourceLength == 0) { diff --git a/saga/sndres.cpp b/saga/sndres.cpp index 2b0e585cfe..8c770d733d 100644 --- a/saga/sndres.cpp +++ b/saga/sndres.cpp @@ -58,7 +58,7 @@ SndRes::SndRes(SagaEngine *vm) : _vm(vm) { } else { ResourceContext *resourceContext; - resourceContext = _vm->_resource->getContext(GAME_RESOURCEFILE); + resourceContext = _vm->_resource->getContext(GAME_SOUNDFILE); if (resourceContext == NULL) { error("Resource::loadGlobalResources() resource context not found"); } |