[Scummvm-cvs-logs] CVS: scummvm/queen talk.cpp,1.30,1.31

Joost Peters joostp at users.sourceforge.net
Thu Nov 6 16:55:07 CET 2003


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

Modified Files:
	talk.cpp 
Log Message:
Don't try to speak NULL strings, this fixes atleast 1 crash. (looking out the hotel window)


Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- talk.cpp	6 Nov 2003 21:06:01 -0000	1.30
+++ talk.cpp	7 Nov 2003 00:54:41 -0000	1.31
@@ -59,7 +59,11 @@
 		Resource *resource,
 	       	Sound *sound) {
 	Talk *talk = new Talk(graphics, input, logic, resource, sound);
-	bool result = talk->speak(sentence, person, voiceFilePrefix);
+	bool result;
+	if (sentence)
+		result = talk->speak(sentence, person, voiceFilePrefix);
+	else
+		result = false;
 	delete talk;
 	return result;
 }





More information about the Scummvm-git-logs mailing list