thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Turned SfxState into a proper class (i.e., convert the sfx_ funcs to member methods)

Browse source 
svn-id: r40973
This commit is contained in:
Max Horn 2009-05-28 22:48:15 +00:00
parent 56b1eb7d09
commit d3bd7b622c
6 changed files with 283 additions and 305 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/sci/engine/savegame.cpp
View file

@ -720,7 +720,7 @@ static void reconstruct_sounds(EngineState *s) {
oldstatus = seeker->status;
seeker->status = SOUND_STATUS_STOPPED;
seeker->it = ff;
sfx_song_set_status(&s->_sound, seeker->handle, oldstatus);
s->_sound.sfx_song_set_status(seeker->handle, oldstatus);
seeker = seeker->next;
}
}
@ -770,7 +770,7 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
retval->saveLoadWithSerializer(ser); // FIXME: Error handling?
sfx_exit(&s->_sound);
s->_sound.sfx_exit();
// Set exec stack base to zero
retval->execution_stack_base = 0;
@ -784,7 +784,7 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
retval->resmgr = s->resmgr;
temp = retval->_sound._songlib;
sfx_init(&retval->_sound, retval->resmgr, s->sfx_init_flags);
retval->_sound.sfx_init(retval->resmgr, s->sfx_init_flags);
retval->sfx_init_flags = s->sfx_init_flags;
song_lib_free(retval->_sound._songlib);
retval->_sound._songlib = temp;