libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 01:07:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patch 614223: _sfxMode fix

Browse Source 
svn-id: r5019
This commit is contained in:
James Brown 2002-09-26 09:59:47 +00:00
parent b5efef6be5
commit 522ee88b62
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scumm/scummvm.cpp
View File

@ -1030,7 +1030,7 @@ void Scumm::processKbd()
runScript(_vars[VAR_UNK_SCRIPT_2], 0, 0, 0);
} else if (_lastKeyHit == _vars[VAR_TALKSTOP_KEY]) {
_talkDelay = 0;
if (_sound->_sfxMode == 2)
if (_sound->_sfxMode & 2)
stopTalk();
return;
} else if (_lastKeyHit == '[') { // [, eg volume down

14
scumm/sound.cpp
View File

@ -393,7 +393,7 @@ void Sound::processSfxQueues() {
_talk_sound_mode = 0;
}
if (_scumm->_vars[_scumm->VAR_TALK_ACTOR]) { //_sfxMode == 2) {
if (_scumm->_vars[_scumm->VAR_TALK_ACTOR]) { //_sfxMode & 2) {
act = _scumm->_vars[_scumm->VAR_TALK_ACTOR];
if (_talkChannel < 0)
finished = false;
@ -422,14 +422,14 @@ void Sound::processSfxQueues() {
if (finished && _scumm->_talkDelay == 0) {
_scumm->stopTalk();
_sfxMode = 0;
_sfxMode &= ~2;
_talkChannel = -1;
}
}
if (_sfxMode == 1) {
if (_sfxMode & 1) {
if (isSfxFinished()) {
_sfxMode = 0;
_sfxMode &= ~1;
}
}
}
@ -490,7 +490,7 @@ int Sound::startTalkSound(uint32 offset, uint32 b, int mode) {
num--;
}
_mouthSyncTimes[i] = 0xFFFF;
_sfxMode = mode;
_sfxMode |= mode;
_curSoundPos = 0;
_mouthSyncMode = true;
@ -498,9 +498,9 @@ int Sound::startTalkSound(uint32 offset, uint32 b, int mode) {
}
void Sound::stopTalkSound() {
if (_sfxMode == 2) {
if (_sfxMode & 2) {
stopSfxSound();
_sfxMode = 0;
_sfxMode &= ~2;
}
}