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

[David Eriksson]

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

Modified Files:
	cutaway.cpp 
Log Message:
Correct previous fix :-)


Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- cutaway.cpp	10 Jan 2004 15:52:00 -0000	1.110
+++ cutaway.cpp	10 Jan 2004 16:13:21 -0000	1.111
@@ -1352,21 +1352,21 @@
 		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;