[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.59,1.60 logic.h,1.19,1.20 text.h,1.15,1.16

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv10154/sky

Modified Files:
	logic.cpp logic.h text.h 
Log Message:
added fnSpeak* functions

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- logic.cpp	30 May 2003 12:53:33 -0000	1.59
+++ logic.cpp	30 May 2003 13:47:32 -0000	1.60
@@ -1348,14 +1348,17 @@
 	return false;
 }
 
-bool SkyLogic::fnSpeakMe(uint32 a, uint32 b, uint32 c) {
-	warning("Stub: fnSpeakMe");
-	return false;
+bool SkyLogic::fnSpeakMe(uint32 targetId, uint32 mesgNum, uint32 animNum) {
+	//stdSpeak(SkyState::fetchCompact(targetId), mesgNum, animNum, 0);
+	return false; 	//drop out of script
 }
 
-bool SkyLogic::fnSpeakMeDir(uint32 a, uint32 b, uint32 c) {
-	warning("Stub: fnSpeakMeDir");
-	return false;
+bool SkyLogic::fnSpeakMeDir(uint32 targetId, uint32 mesgNum, uint32 animNum) {
+	//must be player so don't cause script to drop out
+	//this function sets the directional option whereby
+	//the anim chosen is linked to c_dir
+	animNum += _compact->extCompact->dir << 1;	//2 sizes (large and small)
+	return fnSpeakMe(targetId, mesgNum, animNum);
 }
 
 bool SkyLogic::fnSpeakWait(uint32 id, uint32 message, uint32 animation) {

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- logic.h	28 May 2003 23:31:42 -0000	1.19
+++ logic.h	30 May 2003 13:47:33 -0000	1.20
@@ -121,8 +121,8 @@
 	bool fnClearStop(uint32 a, uint32 b, uint32 c);
 	bool fnPointerText(uint32 a, uint32 b, uint32 c);
 	bool fnQuit(uint32 a, uint32 b, uint32 c);
-	bool fnSpeakMe(uint32 a, uint32 b, uint32 c);
-	bool fnSpeakMeDir(uint32 a, uint32 b, uint32 c);
+	bool fnSpeakMe(uint32 targetId, uint32 mesgNum, uint32 animNum);
+	bool fnSpeakMeDir(uint32 targetId, uint32 mesgNum, uint32 animNum);
 	bool fnSpeakWait(uint32 a, uint32 b, uint32 c);
 	bool fnSpeakWaitDir(uint32 a, uint32 b, uint32 c);
 	bool fnChooser(uint32 a, uint32 b, uint32 c);

Index: text.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- text.h	26 May 2003 13:28:43 -0000	1.15
+++ text.h	30 May 2003 13:47:33 -0000	1.16
@@ -75,13 +75,15 @@
 	uint32	_dtLines;	//no of lines to do
 	uint32	_dtLineSize;	//size of one line in bytes
 	uint8	*_dtData;	//address of textdata
-	uint32	_dtLetters;	//no of chars in message
 	char	*_dtText;	//pointer to text
 	uint32	_dtCharSpacing;	//character seperation adjustment
 	uint32	_dtWidth;	//width of chars in last line (for editing (?))
 	uint32	_dtLastWidth;
 	bool	_dtCentre;	//set for centre text
 	uint32	_lowTextWidth;
+
+public:
+	uint32 _dtLetters;	//no of chars in message
 };
 
 #endif