libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 21:54:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI/new music code: Slight cleanup

Browse Source 
svn-id: r46791
This commit is contained in:
Filippos Karapetis 2009-12-31 08:10:51 +00:00
parent 92a8d1360a
commit 762bdc7cad
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engines/sci/sfx/soundcmd.cpp
View File

@ -280,16 +280,9 @@ void SoundCommandParser::cmdInitHandle(reg_t obj, int16 value) {
return;
_state->sfx_add_song(build_iterator(_resMan, number, type, handle), 0, handle, number);
#endif
if (_soundVersion <= SCI_VERSION_0_LATE)
PUT_SEL32V(_segMan, obj, state, kSoundInitialized);
else
PUT_SEL32(_segMan, obj, nodePtr, obj);
#else
PUT_SEL32(_segMan, obj, handle, obj);
#ifndef USE_OLD_MUSIC_FUNCTIONS
MusicEntry *newSound = new MusicEntry();
newSound->resnum = number;
if (number && _resMan->testResource(ResourceId(kResourceTypeSound, number)))
@ -320,6 +313,13 @@ void SoundCommandParser::cmdInitHandle(reg_t obj, int16 value) {
_music->soundInitSnd(newSound);
}
#endif
if (_soundVersion <= SCI_VERSION_0_LATE)
PUT_SEL32V(_segMan, obj, state, kSoundInitialized);
else
PUT_SEL32(_segMan, obj, nodePtr, obj);
PUT_SEL32(_segMan, obj, handle, obj);
}
void SoundCommandParser::cmdPlayHandle(reg_t obj, int16 value) {
@ -409,7 +409,10 @@ void SoundCommandParser::cmdPlayHandle(reg_t obj, int16 value) {
musicSlot = _music->getSlot(obj);
}
PUT_SEL32(_segMan, obj, handle, obj);
if (_soundVersion >= SCI_VERSION_1_EARLY) {
PUT_SEL32(_segMan, obj, nodePtr, obj);
PUT_SEL32V(_segMan, obj, min, 0);
PUT_SEL32V(_segMan, obj, sec, 0);
PUT_SEL32V(_segMan, obj, frame, 0);