diff options
| author | Jonathan Gray | 2002-11-17 03:27:57 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2002-11-17 03:27:57 +0000 |
| commit | ca9101ea6e0474194fb088b647de45b689ac8641 (patch) | |
| tree | 7c1af6b9072accf319267aabeb501de9dfa28624 /scumm | |
| parent | 9b301dc7d19a79d6f6edb616cab7b3c6ee147482 (diff) | |
| download | scummvm-rg350-ca9101ea6e0474194fb088b647de45b689ac8641.tar.gz scummvm-rg350-ca9101ea6e0474194fb088b647de45b689ac8641.tar.bz2 scummvm-rg350-ca9101ea6e0474194fb088b647de45b689ac8641.zip | |
hack around another null dref for indy3, fixes 639201
svn-id: r5588
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v1.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scumm/script_v1.cpp b/scumm/script_v1.cpp index 971e897dd5..5bdc9a8e54 100644 --- a/scumm/script_v1.cpp +++ b/scumm/script_v1.cpp @@ -1470,6 +1470,8 @@ void Scumm::o5_putActorInRoom() a = derefActorSafe(getVarOrDirectByte(0x80), "o5_putActorInRoom"); room = getVarOrDirectByte(0x40); + + if (a == NULL) return; // FIXME - yet another null dref hack, see bug 639201 if (a->visible && _currentRoom != room && _vars[VAR_TALK_ACTOR] == a->number) { clearMsgQueue(); } |