[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.240,1.241

Travis Howell kirben at users.sourceforge.net
Sat Aug 14 21:53:01 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14507/scumm

Modified Files:
	string.cpp 
Log Message:

Add patch for:
#1009417 - scummvm crashes in first dialogue at sophia's flat

Verified via disasm. of original games.


Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- string.cpp	14 Aug 2004 19:39:16 -0000	1.240
+++ string.cpp	15 Aug 2004 04:52:18 -0000	1.241
@@ -233,7 +233,8 @@
 			case 9:
 				frme = *buffer++;
 				frme |= *buffer++ << 8;
-				a->startAnimActor(frme);
+				if (a) 
+					a->startAnimActor(frme);
 				break;
 			case 10:
 				talk_sound_a = buffer[0] | (buffer[1] << 8) | (buffer[4] << 16) | (buffer[5] << 24);





More information about the Scummvm-git-logs mailing list