diff options
| author | Filippos Karapetis | 2009-11-19 22:57:26 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-11-19 22:57:26 +0000 |
| commit | eefa01af68ec398219daa8ca8c8389f03a8bc48a (patch) | |
| tree | bcd9d3e76da0c19f2c8a716df623a5c35479b45e /engines | |
| parent | 746f391b8a05e56f9f3f9c810bf809e6e54415fa (diff) | |
| download | scummvm-rg350-eefa01af68ec398219daa8ca8c8389f03a8bc48a.tar.gz scummvm-rg350-eefa01af68ec398219daa8ca8c8389f03a8bc48a.tar.bz2 scummvm-rg350-eefa01af68ec398219daa8ca8c8389f03a8bc48a.zip | |
Simplified some music checks for SCI0
svn-id: r45994
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/sfx/soundcmd.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/sfx/soundcmd.cpp b/engines/sci/sfx/soundcmd.cpp index 6623fae549..b425c26379 100644 --- a/engines/sci/sfx/soundcmd.cpp +++ b/engines/sci/sfx/soundcmd.cpp @@ -129,7 +129,7 @@ void process_sound_events(EngineState *s) { /* Get all sound events, apply their SoundCommandParser::SoundCommandParser(ResourceManager *resMan, SegManager *segMan, SfxState *state, AudioPlayer *audio, SciVersion doSoundVersion) : _resMan(resMan), _segMan(segMan), _state(state), _audio(audio), _doSoundVersion(doSoundVersion) { - _hasNodePtr = (_doSoundVersion != SCI_VERSION_0_EARLY); + _hasNodePtr = (((SciEngine*)g_engine)->getKernel()->_selectorCache.nodePtr != -1); #ifndef USE_OLD_MUSIC_FUNCTIONS _music = new SciMusic(); @@ -237,7 +237,7 @@ void SoundCommandParser::cmdInitHandle(reg_t obj, SongHandle handle, int value) return; } - SongIteratorType type = (_doSoundVersion == SCI_VERSION_0_EARLY) ? SCI_SONG_ITERATOR_TYPE_SCI0 : SCI_SONG_ITERATOR_TYPE_SCI1; + SongIteratorType type = !_hasNodePtr ? SCI_SONG_ITERATOR_TYPE_SCI0 : SCI_SONG_ITERATOR_TYPE_SCI1; int number = obj.segment ? GET_SEL32V(_segMan, obj, number) : -1; if (_hasNodePtr) { @@ -292,7 +292,7 @@ void SoundCommandParser::cmdPlayHandle(reg_t obj, SongHandle handle, int value) if (!obj.segment) return; - if (_doSoundVersion == SCI_VERSION_0_EARLY) { + if (!_hasNodePtr) { _state->sfx_song_set_status(handle, SOUND_STATUS_PLAYING); _state->sfx_song_set_loops(handle, GET_SEL32V(_segMan, obj, loop)); PUT_SEL32V(_segMan, obj, state, _K_SOUND_STATUS_PLAYING); @@ -363,7 +363,7 @@ void SoundCommandParser::cmdDummy(reg_t obj, SongHandle handle, int value) { void SoundCommandParser::changeHandleStatus(reg_t obj, SongHandle handle, int newStatus) { if (obj.segment) { _state->sfx_song_set_status(handle, newStatus); - if (_doSoundVersion == SCI_VERSION_0_EARLY) + if (!_hasNodePtr) PUT_SEL32V(_segMan, obj, state, newStatus); } } @@ -598,7 +598,7 @@ void SoundCommandParser::cmdSuspendSound(reg_t obj, SongHandle handle, int value } void SoundCommandParser::cmdUpdateVolumePriority(reg_t obj, SongHandle handle, int value) { - if (_doSoundVersion == SCI_VERSION_0_EARLY && obj.segment) { + if (!_hasNodePtr && obj.segment) { _state->sfx_song_set_loops(handle, GET_SEL32V(_segMan, obj, loop)); script_set_priority(_resMan, _segMan, _state, obj, GET_SEL32V(_segMan, obj, pri)); } |