diff options
| author | Max Horn | 2009-10-13 18:51:59 +0000 |
|---|---|---|
| committer | Max Horn | 2009-10-13 18:51:59 +0000 |
| commit | 8191c04056ea65169e04957d00da11550b3495e3 (patch) | |
| tree | eb140d5afce8247ddc67ffa1fed868a69bf47f0f /engines/sci/engine | |
| parent | 581b819c25e9cf0700f36dd3cf22818db30f9420 (diff) | |
| download | scummvm-rg350-8191c04056ea65169e04957d00da11550b3495e3.tar.gz scummvm-rg350-8191c04056ea65169e04957d00da11550b3495e3.tar.bz2 scummvm-rg350-8191c04056ea65169e04957d00da11550b3495e3.zip | |
SCI: Merge some sfx related global funcs into SfxState.
This allows us to get rid of "static SfxPlayer *s_player".
svn-id: r45038
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/ksound.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/engine/vm.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index 8daaf6f22a..a70cb1a2ea 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -377,7 +377,7 @@ static reg_t kDoSoundSci0(EngineState *s, int argc, reg_t *argv) { break; case _K_SCI0_SOUND_GET_POLYPHONY: - s->r_acc = make_reg(0, sfx_get_player_polyphony()); + s->r_acc = make_reg(0, s->_sound.sfx_get_player_polyphony()); break; case _K_SCI0_SOUND_PLAY_NEXT: @@ -495,7 +495,7 @@ static reg_t kDoSoundSci1Early(EngineState *s, int argc, reg_t *argv) { break; } case _K_SCI01_SOUND_GET_POLYPHONY : { - s->r_acc = make_reg(0, sfx_get_player_polyphony()); + s->r_acc = make_reg(0, s->_sound.sfx_get_player_polyphony()); break; } case _K_SCI01_SOUND_PLAY_HANDLE : { diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index dacda2b644..f534a1945d 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -1765,7 +1765,7 @@ static EngineState *_game_run(EngineState *&s, int restoring) { script_free_engine(s); script_init_engine(s); game_init(s); - sfx_reset_player(); + s->_sound.sfx_reset_player(); _init_stack_base_with_selector(s, s->_kernel->_selectorCache.play); send_selector(s, s->game_obj, s->game_obj, s->stack_base, 2, s->stack_base); |