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

got rid of _xPos, _yPos, _dir members in class Scumm

Browse source 
svn-id: r4578
This commit is contained in:
Max Horn 2002-07-16 18:51:27 +00:00
parent 0d943903c7
commit 32e81beb45
8 changed files with 61 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

15
script_v1.cpp
View file

@ -1732,18 +1732,18 @@ void Scumm::o5_putActor()
void Scumm::o5_putActorAtObject()
{
int obj;
int obj, x, y;
Actor *a;
a = derefActorSafe(getVarOrDirectByte(0x80), "o5_putActorAtObject");
obj = getVarOrDirectWord(0x40);
if (whereIsObject(obj) != WIO_NOT_FOUND)
getObjectXYPos(obj);
getObjectXYPos(obj, x, y);
else {
_xPos = 240;
_yPos = 120;
x = 240;
y = 120;
}
putActor(a, _xPos, _yPos, a->room);
putActor(a, x, y, a->room);
}
void Scumm::o5_putActorInRoom()
@ -2611,8 +2611,9 @@ void Scumm::o5_walkActorToObject()
a = derefActorSafe(getVarOrDirectByte(0x80), "o5_walkActorToObject");
obj = getVarOrDirectWord(0x40);
if (whereIsObject(obj) != WIO_NOT_FOUND) {
getObjectXYPos(obj);
a->startWalkActor(_xPos, _yPos, _dir);
int x, y, dir;
getObjectXYPos(obj, x, y, dir);
a->startWalkActor(x, y, dir);
}
}