diff options
| author | Max Horn | 2003-01-16 01:46:59 +0000 |
|---|---|---|
| committer | Max Horn | 2003-01-16 01:46:59 +0000 |
| commit | bf6e37cba8324374d1506643a582c96cdd5e8e3b (patch) | |
| tree | 226ae4fef9d74c4dc6b87fb8c557a7a6ba0a85fd /scumm/script_v6.cpp | |
| parent | d4122d625f13e59f55ef2f957f0fad5194f5ce2b (diff) | |
| download | scummvm-rg350-bf6e37cba8324374d1506643a582c96cdd5e8e3b.tar.gz scummvm-rg350-bf6e37cba8324374d1506643a582c96cdd5e8e3b.tar.bz2 scummvm-rg350-bf6e37cba8324374d1506643a582c96cdd5e8e3b.zip | |
two changes to accomodate Dig - don't like this :-/
svn-id: r6474
Diffstat (limited to 'scumm/script_v6.cpp')
| -rw-r--r-- | scumm/script_v6.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index d60e7b45f3..3bee1b9336 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1300,8 +1300,10 @@ void Scumm_v6::o6_getActorWidth() void Scumm_v6::o6_getActorScaleX() { Actor *a = derefActorSafe(pop(), "o6_getActorScale"); - assert(a); - push(a->scalex); + if(!a) + push(0); // FIXME: DIG seems to call this with an invalid actor id + else + push(a->scalex); } void Scumm_v6::o6_getActorAnimCounter1() @@ -1315,8 +1317,10 @@ void Scumm_v6::o6_getAnimateVariable() { int var = pop(); Actor *a = derefActorSafe(pop(), "o6_getAnimateVariable"); - assert(a); - push(a->getAnimVar(var)); + if(!a) + push(0); // FIXME: DIG seems to call this with an invalid actor id + else + push(a->getAnimVar(var)); } void Scumm_v6::o6_isActorInBox() |