aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v6.cpp
diff options
context:
space:
mode:
authorMax Horn2003-01-16 01:49:33 +0000
committerMax Horn2003-01-16 01:49:33 +0000
commitb9811d959465e26df83efaaac6c575fb6a629a7f (patch)
tree051a7de2d70505896ce8bf2c7bd6752718825941 /scumm/script_v6.cpp
parentbf6e37cba8324374d1506643a582c96cdd5e8e3b (diff)
downloadscummvm-rg350-b9811d959465e26df83efaaac6c575fb6a629a7f.tar.gz
scummvm-rg350-b9811d959465e26df83efaaac6c575fb6a629a7f.tar.bz2
scummvm-rg350-b9811d959465e26df83efaaac6c575fb6a629a7f.zip
another change for Dig - still crashes a lot with my save games, though :-/
svn-id: r6475
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r--scumm/script_v6.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 3bee1b9336..d518e09643 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -1327,7 +1327,10 @@ void Scumm_v6::o6_isActorInBox()
{
int box = pop();
Actor *a = derefActorSafe(pop(), "o6_isActorInBox");
- push(checkXYInBoxBounds(box, a->x, a->y));
+ if(!a)
+ push(0); // FIXME: DIG seems to call this with an invalid actor id
+ else
+ push(checkXYInBoxBounds(box, a->x, a->y));
}
void Scumm_v6::o6_getActorLayer()