[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.109,1.110

[David Eriksson]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv8118

Modified Files:
	cutaway.cpp 
Log Message:
- Honor speech and subtitle toggles
- Make text stay on screen longer


Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- cutaway.cpp	10 Jan 2004 12:56:07 -0000	1.109
+++ cutaway.cpp	10 Jan 2004 15:52:00 -0000	1.110
@@ -1352,16 +1352,21 @@
 		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 @@
 	while (*segment++)
 		tmp++;
 	
-	if (tmp < 10)
-		tmp = 10;
+	if (tmp < 50)
+		tmp = 50;
 
 	if (OBJECT_TYPE_TEXT_DISPLAY == type)
 		tmp *= 3;