libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-11 19:54:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Honor speech and subtitle toggles

Browse Source 
- Make text stay on screen longer

svn-id: r12297
This commit is contained in:
David Eriksson 2004-01-10 15:52:00 +00:00
parent c13a04f570
commit 102cf0254a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
queen/cutaway.cpp
View File

@ -1352,16 +1352,21 @@ void Cutaway::handleText(
flags = 1;
}
BobSlot *bob =
_vm->graphics()->bob( _vm->logic()->findBob(ABS(object.objectNumber)) );
if (OBJECT_TYPE_TEXT_SPEAK != type && !_vm->subtitles())
{
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");
_vm->sound()->playSfx(voiceFileName);
if (_vm->sound()->speechOn())
_vm->sound()->playSfx(voiceFileName);
}
int i;
@ -1391,8 +1396,8 @@ int Cutaway::countSpaces(ObjectType type, const char *segment) {
while (*segment++)
tmp++;
if (tmp < 10)
tmp = 10;
if (tmp < 50)
tmp = 50;
if (OBJECT_TYPE_TEXT_DISPLAY == type)
tmp *= 3;