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

fix return values in getObjectOrActorXY; turned unsafe derefActorSafe call into derefActor (return value of derefActorSafe was used w/o checking it for 0)

Browse source 
svn-id: r9206
This commit is contained in:
Max Horn 2003-07-28 00:04:20 +00:00
parent ff988094be
commit 0d209fecb6
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scumm/object.cpp
View file

@ -199,10 +199,10 @@ int Scumm::whereIsObject(int object) const {
int Scumm::getObjectOrActorXY(int object, int &x, int &y) {
if (object < _numActors) {
Actor *act = derefActorSafe(object, "getObjectOrActorXY");
if (!act)
return 0;
else
if (act)
return act->getActorXYPos(x, y);
else
return -1;
}
switch (whereIsObject(object)) {
@ -210,9 +210,9 @@ int Scumm::getObjectOrActorXY(int object, int &x, int &y) {
return -1;
case WIO_INVENTORY:
if (_objectOwnerTable[object] < _numActors)
return derefActorSafe(_objectOwnerTable[object], "getObjectOrActorXY(2)")->getActorXYPos(x, y);
return derefActor(_objectOwnerTable[object], "getObjectOrActorXY(2)")->getActorXYPos(x, y);
else
return 0xFF;
return -1;
}
getObjectXYPos(object, x, y);
return 0;
@ -461,7 +461,7 @@ void Scumm::clearRoomObjects() {
nukeResource(rtFlObject, _objs[i].fl_object_index);
_objs[i].obj_nr = 0;
_objs[i].fl_object_index = 0;
}
}
}
}
}