diff options
| author | Filippos Karapetis | 2013-01-13 15:51:52 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2013-01-13 15:51:52 +0200 |
| commit | e45950b966ea6d03366b4238729ee76f4d84957f (patch) | |
| tree | ddeaeec9ed13337039e92013ace2c074d0bdd233 | |
| parent | b7bfff1bfaac86d53958b34b9dfcdfb8a1f2e55e (diff) | |
| download | scummvm-rg350-e45950b966ea6d03366b4238729ee76f4d84957f.tar.gz scummvm-rg350-e45950b966ea6d03366b4238729ee76f4d84957f.tar.bz2 scummvm-rg350-e45950b966ea6d03366b4238729ee76f4d84957f.zip | |
TOLTECS: Whitespace fixes
| -rw-r--r-- | engines/toltecs/sound.cpp | 7 | ||||
| -rw-r--r-- | engines/toltecs/toltecs.cpp | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/engines/toltecs/sound.cpp b/engines/toltecs/sound.cpp index 4b281392e5..922ed05346 100644 --- a/engines/toltecs/sound.cpp +++ b/engines/toltecs/sound.cpp @@ -103,7 +103,6 @@ void Sound::internalPlaySound(int16 resIndex, int16 type, int16 volume, int16 pa } } } else { - if (type == -3) { // Stop speech and play new sound stopSpeech(); @@ -137,10 +136,8 @@ void Sound::internalPlaySound(int16 resIndex, int16 type, int16 volume, int16 pa _vm->_mixer->playStream(soundType, &channels[freeChannel].handle, stream, -1, volume, panning); - } - - } - + } // if (freeChannel >= 0) + } // resIndex } void Sound::updateSpeech() { diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp index 3b7b82d196..02a0e338a0 100644 --- a/engines/toltecs/toltecs.cpp +++ b/engines/toltecs/toltecs.cpp @@ -514,6 +514,7 @@ void ToltecsEngine::talk(int16 slotIndex, int16 slotOffset) { debug(0, "ToltecsEngine::talk() playSound(resIndex: %d)", resIndex); _sound->playSpeech(resIndex); } + if (_doText) { _screen->updateTalkText(slotIndex, slotOffset, false); } else { |