[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.193.2.10,1.193.2.11
Travis Howell
kirben at users.sourceforge.net
Sat Aug 14 22:00:01 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15138/scumm
Modified Files:
Tag: branch-0-6-0
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.193.2.10
retrieving revision 1.193.2.11
diff -u -d -r1.193.2.10 -r1.193.2.11
--- string.cpp 14 Aug 2004 03:07:34 -0000 1.193.2.10
+++ string.cpp 15 Aug 2004 04:59:16 -0000 1.193.2.11
@@ -91,7 +91,7 @@
uint32 talk_sound_a = 0;
uint32 talk_sound_b = 0;
int s, i, t, c;
- int frme = -1;
+ int frme;
Actor *a;
byte *buffer;
@@ -258,7 +258,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