diff options
| author | Filippos Karapetis | 2008-09-08 08:26:54 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-09-08 08:26:54 +0000 |
| commit | 4be876442852dad389c9e7d3032dd263d6fef576 (patch) | |
| tree | aa9c9a913ec139ca1469284c0d6d707b59118a46 /engines/saga | |
| parent | dc366ff266967ca857fcf033de9f03540383cf19 (diff) | |
| download | scummvm-rg350-4be876442852dad389c9e7d3032dd263d6fef576.tar.gz scummvm-rg350-4be876442852dad389c9e7d3032dd263d6fef576.tar.bz2 scummvm-rg350-4be876442852dad389c9e7d3032dd263d6fef576.zip | |
Free the current voice lookup table a bit earlier in loadGlobalResources()
svn-id: r34442
Diffstat (limited to 'engines/saga')
| -rw-r--r-- | engines/saga/rscfile.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/engines/saga/rscfile.cpp b/engines/saga/rscfile.cpp index be4f6cf90b..0ef4629661 100644 --- a/engines/saga/rscfile.cpp +++ b/engines/saga/rscfile.cpp @@ -661,9 +661,7 @@ void Resource::loadGlobalResources(int chapter, int actorsEntrance) { if (chapter < 0) chapter = (_vm->getGameId() != GID_IHNM_DEMO) ? 8 : 7; - // TODO - //if (module.voiceLUT) - // free module.voiceLUT; + _vm->_script->_globalVoiceLUT.freeMem(); // TODO: close chapter context, or rather reassign it in our case @@ -769,7 +767,6 @@ void Resource::loadGlobalResources(int chapter, int actorsEntrance) { _vm->_sprite->_mainSprites.freeMem(); _vm->_sprite->loadList(_metaResource.mainSpritesID, _vm->_sprite->_mainSprites); - _vm->_actor->loadObjList(_metaResource.objectCount, _metaResource.objectsResourceID); _vm->_resource->loadResource(resourceContext, _metaResource.cutawayListResourceID, resourcePointer, resourceLength); @@ -812,8 +809,6 @@ void Resource::loadGlobalResources(int chapter, int actorsEntrance) { int voiceLUTResourceID = 0; - _vm->_script->_globalVoiceLUT.freeMem(); - if (chapter != 7) { int voiceBank = (chapter == 8) ? 0 : chapter; _vm->_sndRes->setVoiceBank(voiceBank); |