diff options
| author | David Eriksson | 2004-01-10 16:13:21 +0000 |
|---|---|---|
| committer | David Eriksson | 2004-01-10 16:13:21 +0000 |
| commit | aab4e7a011b6e35821b83348538564527957a959 (patch) | |
| tree | 6d22de4c55ad5ba75a7264848cb153a715169318 /queen/cutaway.cpp | |
| parent | 5d50f01b2f9e5f9bea99dab066e5f0551fb93ac0 (diff) | |
| download | scummvm-rg350-aab4e7a011b6e35821b83348538564527957a959.tar.gz scummvm-rg350-aab4e7a011b6e35821b83348538564527957a959.tar.bz2 scummvm-rg350-aab4e7a011b6e35821b83348538564527957a959.zip | |
Correct previous fix :-)
svn-id: r12301
Diffstat (limited to 'queen/cutaway.cpp')
| -rw-r--r-- | queen/cutaway.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index 6ed11af40a..5c4e7cb369 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -1352,21 +1352,21 @@ void Cutaway::handleText( flags = 1; } - if (OBJECT_TYPE_TEXT_SPEAK != type && !_vm->subtitles()) - { - BobSlot *bob = - _vm->graphics()->bob( _vm->logic()->findBob(ABS(object.objectNumber)) ); + BobSlot *bob = + _vm->graphics()->bob( _vm->logic()->findBob(ABS(object.objectNumber)) ); - _vm->graphics()->setBobText(bob, sentence, x, object.bobStartY, object.specialMove, flags); - } + _vm->graphics()->setBobText(bob, sentence, x, object.bobStartY, object.specialMove, flags); if (OBJECT_TYPE_TEXT_SPEAK == type || OBJECT_TYPE_TEXT_DISPLAY_AND_SPEAK == type) { - char voiceFileName[MAX_STRING_SIZE]; - findCdCut(_basename, index, voiceFileName); - strcat(voiceFileName, "1"); - - if (_vm->sound()->speechOn()) + if (_vm->sound()->speechOn()) { + char voiceFileName[MAX_STRING_SIZE]; + findCdCut(_basename, index, voiceFileName); + strcat(voiceFileName, "1"); _vm->sound()->playSfx(voiceFileName); + } + + if (OBJECT_TYPE_TEXT_SPEAK == type && _vm->sound()->speechOn() && !_vm->subtitles()) + _vm->display()->clearTexts(0, 150); } int i; |