diff options
| author | Max Horn | 2003-01-16 14:42:20 +0000 |
|---|---|---|
| committer | Max Horn | 2003-01-16 14:42:20 +0000 |
| commit | d5a266f2ca7ca39b31286d8f34eae26a2919ba8e (patch) | |
| tree | 6893fc75587259de52b6b30cbd6e840dd7c181bc | |
| parent | b1f1a9e4e91115055f1bc873d0010b7bca51c8f9 (diff) | |
| download | scummvm-rg350-d5a266f2ca7ca39b31286d8f34eae26a2919ba8e.tar.gz scummvm-rg350-d5a266f2ca7ca39b31286d8f34eae26a2919ba8e.tar.bz2 scummvm-rg350-d5a266f2ca7ca39b31286d8f34eae26a2919ba8e.zip | |
reversed Dig workarounds - better to find the real cause of the regression, says Endy
svn-id: r6483
| -rw-r--r-- | scumm/script_v6.cpp | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index d518e09643..6369f06bcb 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1300,10 +1300,8 @@ void Scumm_v6::o6_getActorWidth() void Scumm_v6::o6_getActorScaleX() { Actor *a = derefActorSafe(pop(), "o6_getActorScale"); - if(!a) - push(0); // FIXME: DIG seems to call this with an invalid actor id - else - push(a->scalex); + assert(a); + push(a->scalex); } void Scumm_v6::o6_getActorAnimCounter1() @@ -1317,20 +1315,16 @@ void Scumm_v6::o6_getAnimateVariable() { int var = pop(); Actor *a = derefActorSafe(pop(), "o6_getAnimateVariable"); - if(!a) - push(0); // FIXME: DIG seems to call this with an invalid actor id - else - push(a->getAnimVar(var)); + assert(a); + push(a->getAnimVar(var)); } void Scumm_v6::o6_isActorInBox() { int box = pop(); Actor *a = derefActorSafe(pop(), "o6_isActorInBox"); - if(!a) - push(0); // FIXME: DIG seems to call this with an invalid actor id - else - push(checkXYInBoxBounds(box, a->x, a->y)); + assert(a); + push(checkXYInBoxBounds(box, a->x, a->y)); } void Scumm_v6::o6_getActorLayer() @@ -2301,8 +2295,8 @@ void Scumm_v6::o6_printActor() void Scumm_v6::o6_printEgo() { - _actorToPrintStrFor = _vars[VAR_EGO]; - decodeParseString(0, 0); + push(_vars[VAR_EGO]); + decodeParseString(0, 1); } void Scumm_v6::o6_talkActor() |