thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reversed Dig workarounds - better to find the real cause of the regression, says Endy

Browse source 
svn-id: r6483
This commit is contained in:
Max Horn 2003-01-16 14:42:20 +00:00
parent b1f1a9e4e9
commit d5a266f2ca
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
scumm/script_v6.cpp
View file

@ -1300,10 +1300,8 @@ void Scumm_v6::o6_getActorWidth()
void Scumm_v6::o6_getActorScaleX() void Scumm_v6::o6_getActorScaleX()
{ {
Actor *a = derefActorSafe(pop(), "o6_getActorScale"); Actor *a = derefActorSafe(pop(), "o6_getActorScale");
if(!a) assert(a);
push(0); // FIXME: DIG seems to call this with an invalid actor id push(a->scalex);
else
push(a->scalex);
} }
void Scumm_v6::o6_getActorAnimCounter1() void Scumm_v6::o6_getActorAnimCounter1()
@ -1317,20 +1315,16 @@ void Scumm_v6::o6_getAnimateVariable()
{ {
int var = pop(); int var = pop();
Actor *a = derefActorSafe(pop(), "o6_getAnimateVariable"); Actor *a = derefActorSafe(pop(), "o6_getAnimateVariable");
if(!a) assert(a);
push(0); // FIXME: DIG seems to call this with an invalid actor id push(a->getAnimVar(var));
else
push(a->getAnimVar(var));
} }
void Scumm_v6::o6_isActorInBox() void Scumm_v6::o6_isActorInBox()
{ {
int box = pop(); int box = pop();
Actor *a = derefActorSafe(pop(), "o6_isActorInBox"); Actor *a = derefActorSafe(pop(), "o6_isActorInBox");
if(!a) assert(a);
push(0); // FIXME: DIG seems to call this with an invalid actor id push(checkXYInBoxBounds(box, a->x, a->y));
else
push(checkXYInBoxBounds(box, a->x, a->y));
} }
void Scumm_v6::o6_getActorLayer() void Scumm_v6::o6_getActorLayer()
@ -2301,8 +2295,8 @@ void Scumm_v6::o6_printActor()
void Scumm_v6::o6_printEgo() void Scumm_v6::o6_printEgo()
{ {
_actorToPrintStrFor = _vars[VAR_EGO]; push(_vars[VAR_EGO]);
decodeParseString(0, 0); decodeParseString(0, 1);
} }
void Scumm_v6::o6_talkActor() void Scumm_v6::o6_talkActor()