aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/script_v1.cpp2
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();
}