[Scummvm-cvs-logs] SF.net SVN: scummvm:[46196] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 46196
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46196&view=rev
Author:   thebluegr
Date:     2009-11-29 14:44:12 +0000 (Sun, 29 Nov 2009)

Log Message:
-----------
Properly update the sound state in the sound command parser when loading a game

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/savegame.cpp
    scummvm/trunk/engines/sci/sfx/soundcmd.h

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2009-11-29 13:55:26 UTC (rev 46195)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-11-29 14:44:12 UTC (rev 46196)
@@ -790,6 +790,7 @@
 	retval->sfx_init_flags = s->sfx_init_flags;
 	retval->_sound._songlib.freeSounds();
 	retval->_sound._songlib = temp;
+	retval->_soundCmd->updateSfxState(&retval->_sound);
 
 	reconstruct_stack(retval);
 	retval->_segMan->reconstructScripts(retval);

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.h	2009-11-29 13:55:26 UTC (rev 46195)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.h	2009-11-29 14:44:12 UTC (rev 46196)
@@ -46,6 +46,8 @@
 	SoundCommandParser(ResourceManager *resMan, SegManager *segMan, SfxState *state, AudioPlayer *audio, SciVersion doSoundVersion);
 	~SoundCommandParser();
 
+	void updateSfxState(SfxState *newState) { _state = newState; }
+
 	reg_t parseCommand(int argc, reg_t *argv, reg_t acc);
 
 private:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.