[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.42,1.43 cutaway.h,1.19,1.20

[David Eriksson]

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

Modified Files:
	cutaway.cpp cutaway.h 
Log Message:
- Add some missing speech
- Disable debug messages


Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- cutaway.cpp	21 Oct 2003 12:29:37 -0000	1.42
+++ cutaway.cpp	21 Oct 2003 13:18:02 -0000	1.43
@@ -23,6 +23,7 @@
 #include "cutaway.h"
 #include "display.h"
 #include "graphics.h"
+#include "sound.h"
 #include "talk.h"
 #include "walk.h"
 
@@ -356,7 +357,7 @@
 					if (horizontalScroll > k)
 						horizontalScroll = k;
 
-					debug(0, "horizontalScroll = %i", horizontalScroll);
+					//debug(0, "horizontalScroll = %i", horizontalScroll);
 
 					display->horizontalScroll(horizontalScroll);
 
@@ -1124,7 +1125,7 @@
 			case OBJECT_TYPE_TEXT_SPEAK:
 			case OBJECT_TYPE_TEXT_DISPLAY_AND_SPEAK:
 			case OBJECT_TYPE_TEXT_DISPLAY:
-				handleText(objectType, object, sentence);
+				handleText(i + 1, objectType, object, sentence);
 				break;
 
 			default:
@@ -1433,13 +1434,13 @@
 
 	for (i = 0; i < frameCount; i++) {
 		_cutAnim[bobNum][i].frame = currentImage + frameIndex[objAnim[i].unpackFrame];
-		debug(0, "_cutAnim[%i][%i].frame = %i", bobNum, i, _cutAnim[bobNum][i].frame);
+		//debug(0, "_cutAnim[%i][%i].frame = %i", bobNum, i, _cutAnim[bobNum][i].frame);
 	}
 
 	for (i = 1; i < 256; i++) {
 		if (frameIndex[i]) {
 			currentImage++;
-			debug(0, "bankUnpack(%i, %i, %i)", i, currentImage, objAnim[0].bank);
+			//debug(0, "bankUnpack(%i, %i, %i)", i, currentImage, objAnim[0].bank);
 			_graphics->bankUnpack(i, currentImage, objAnim[0].bank);
 		}
 	}
@@ -1450,6 +1451,7 @@
 }
 
 void Cutaway::handleText(
+		int index,
 		ObjectType type, 
 		CutawayObject &object,
 		const char *sentence) {
@@ -1477,7 +1479,10 @@
 	_graphics->bobSetText(bob, sentence, x, object.bobStartY, object.specialMove, flags);
 
 	if (OBJECT_TYPE_TEXT_SPEAK == type || OBJECT_TYPE_TEXT_DISPLAY_AND_SPEAK == type) {
-		// XXX: speak
+		char voiceFileName[MAX_STRING_SIZE];
+		findCdCut(_basename, index, voiceFileName);
+		strcat(voiceFileName, "1");
+		_sound->sfxPlay(voiceFileName);
 	}
 
 	int i;

Index: cutaway.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cutaway.h	21 Oct 2003 12:29:37 -0000	1.19
+++ cutaway.h	21 Oct 2003 13:18:02 -0000	1.20
@@ -254,6 +254,7 @@
 		
 		//! Perform text actions
 		void handleText(
+				int index, 
 				ObjectType type, 
 				CutawayObject &object, 
 				const char *sentence);