[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.104,2.105

Jonathan Gray khalek at users.sourceforge.net
Thu May 22 04:41:05 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv6764

Modified Files:
	script_v2.cpp 
Log Message:
make drawSentence not crash on us

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.104
retrieving revision 2.105
diff -u -d -r2.104 -r2.105
--- script_v2.cpp	22 May 2003 05:44:18 -0000	2.104
+++ script_v2.cpp	22 May 2003 11:40:20 -0000	2.105
@@ -903,7 +903,11 @@
 	if (!(_userState & 32))
 		return;
 
-	strcpy(sentence, (char*)getResourceAddress(rtVerb, slot));
+	if (getResourceAddress(rtVerb, slot))
+		strcpy(sentence, (char*)getResourceAddress(rtVerb, slot));
+	else
+		return;
+
 	if (VAR(VAR_SENTENCE_OBJECT1) > 0) {
 		temp = getObjOrActorName(VAR(VAR_SENTENCE_OBJECT1));
 		if (temp) {





More information about the Scummvm-git-logs mailing list