aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-08-15 04:52:18 +0000
committerTravis Howell2004-08-15 04:52:18 +0000
commitd8dbb063b52810535c9ed50e8b585d9df668e62d (patch)
treeb320325bd6b6b768cce2fc1e448981ed3e73167a
parent9f13a75c7949af79468305d32a4670cb78ef8208 (diff)
downloadscummvm-rg350-d8dbb063b52810535c9ed50e8b585d9df668e62d.tar.gz
scummvm-rg350-d8dbb063b52810535c9ed50e8b585d9df668e62d.tar.bz2
scummvm-rg350-d8dbb063b52810535c9ed50e8b585d9df668e62d.zip
Add patch for:
#1009417 - scummvm crashes in first dialogue at sophia's flat Verified via disasm. of original games. svn-id: r14619
-rw-r--r--scumm/string.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp
index df2b245c5d..d34f41940c 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -233,7 +233,8 @@ void ScummEngine::CHARSET_1() {
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);