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

LAB: Clean up sound effect looping, starting and stopping code

Browse source
This commit is contained in:
Filippos Karapetis 2015-12-26 12:45:48 +02:00
parent e231c6753b
commit d1b5d41005
4 changed files with 19 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

29
engines/lab/processroom.cpp
View file

@ -239,18 +239,15 @@ void LabEngine::doActions(const ActionList &actionList, CloseDataPtr *closePtrLi
switch (action->_actionType) {
case kActionPlaySound:
_music->_loopSoundEffect = false;
_music->readMusic(action->_messages[0], true);
_music->readMusic(action->_messages[0], false, true);
break;
case kActionPlaySoundNoWait:
_music->_loopSoundEffect = false;
_music->readMusic(action->_messages[0], false);
case kActionPlaySoundNoWait: // only used in scene 7 (street, when teleporting to the surreal maze)
_music->readMusic(action->_messages[0], false, false);
break;
case kActionPlaySoundLooping:
_music->_loopSoundEffect = true;
_music->readMusic(action->_messages[0], false);
_music->readMusic(action->_messages[0], true, false);
break;
case kActionShowDiff:
@ -411,12 +408,7 @@ void LabEngine::doActions(const ActionList &actionList, CloseDataPtr *closePtrLi
break;
case kActionClearSound:
if (_music->_loopSoundEffect) {
_music->_loopSoundEffect = false;
_music->stopSoundEffect();
} else if (_music->isSoundEffectActive())
_music->stopSoundEffect();
_music->stopSoundEffect();
break;
case kActionWinMusic:
@ -474,16 +466,7 @@ void LabEngine::doActions(const ActionList &actionList, CloseDataPtr *closePtrLi
}
}
if (_music->_loopSoundEffect) {
_music->_loopSoundEffect = false;
_music->stopSoundEffect();
} else {
while (_music->isSoundEffectActive()) {
updateMusicAndEvents();
_anim->diffNextFrame();
waitTOF();
}
}
_music->stopSoundEffect();
}
bool LabEngine::doActionRuleSub(int16 action, int16 roomNum, CloseDataPtr closePtr, CloseDataPtr *setCloseList, bool allowDefaults) {