[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.61,1.62 text.cpp,1.25,1.26

Joost Peters joostp at users.sourceforge.net
Fri May 30 08:07:15 CEST 2003


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

Modified Files:
	logic.cpp text.cpp 
Log Message:
fixed stupid bug

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- logic.cpp	30 May 2003 14:20:31 -0000	1.61
+++ logic.cpp	30 May 2003 14:48:09 -0000	1.62
@@ -1349,7 +1349,7 @@
 }
 
 bool SkyLogic::fnSpeakMe(uint32 targetId, uint32 mesgNum, uint32 animNum) {
-	//stdSpeak(SkyState::fetchCompact(targetId), mesgNum, animNum, 0);
+	stdSpeak(SkyState::fetchCompact(targetId), mesgNum, animNum, 0);
 	return false; 	//drop out of script
 }
 

Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- text.cpp	30 May 2003 13:07:27 -0000	1.25
+++ text.cpp	30 May 2003 14:48:09 -0000	1.26
@@ -244,7 +244,7 @@
 	if (_dtData == NULL)
 		_dtData = (byte *)malloc(numBytes);
 
-	byte *curDest = dest;
+	byte *curDest = _dtData; 
 
 	uint32 bytesToClear = numBytes; //no of bytes to clear
 	bytesToClear -= sizeof(struct dataFileHeader);	//don't touch the header.





More information about the Scummvm-git-logs mailing list