[Scummvm-cvs-logs] SF.net SVN: scummvm:[34442] scummvm/trunk/engines/saga/rscfile.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Sep 8 10:26:55 CEST 2008
Revision: 34442
http://scummvm.svn.sourceforge.net/scummvm/?rev=34442&view=rev
Author: thebluegr
Date: 2008-09-08 08:26:54 +0000 (Mon, 08 Sep 2008)
Log Message:
-----------
Free the current voice lookup table a bit earlier in loadGlobalResources()
Modified Paths:
--------------
scummvm/trunk/engines/saga/rscfile.cpp
Modified: scummvm/trunk/engines/saga/rscfile.cpp
===================================================================
--- scummvm/trunk/engines/saga/rscfile.cpp 2008-09-08 08:09:22 UTC (rev 34441)
+++ scummvm/trunk/engines/saga/rscfile.cpp 2008-09-08 08:26:54 UTC (rev 34442)
@@ -661,9 +661,7 @@
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 @@
_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 @@
int voiceLUTResourceID = 0;
- _vm->_script->_globalVoiceLUT.freeMem();
-
if (chapter != 7) {
int voiceBank = (chapter == 8) ? 0 : chapter;
_vm->_sndRes->setVoiceBank(voiceBank);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list