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

added yet another sanity check (assert); fixed long standing evil bug in getObjNewDir / getObjOldDir

Browse source 
svn-id: r6763
This commit is contained in:
Max Horn 2003-03-08 00:56:43 +00:00
parent 20c6cfdd2d
commit c739960176
2 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scumm/object.cpp
View file

@ -1068,31 +1068,16 @@ int Scumm::getObjY(int obj) {
}
int Scumm::getObjOldDir(int obj) {
if (obj < NUM_ACTORS) {
return newDirToOldDir(derefActorSafe(obj, "getObjOldDir")->facing);
} else {
int x, y, dir;
getObjectXYPos(obj, x, y, dir);
return dir;
}
return newDirToOldDir(getObjNewDir(obj));
}
int another_dummy_valgrind_var = 0;
int Scumm::getObjNewDir(int obj) {
int dir;
if (obj < NUM_ACTORS) {
dir = derefActorSafe(obj, "getObjNewDir")->facing;
if (dir > 0)
another_dummy_valgrind_var++;
} else {
int x, y;
getObjectXYPos(obj, x, y, dir);
if (dir > 0)
another_dummy_valgrind_var *= 2;
dir = oldDirToNewDir(dir);
if (dir > 0)
another_dummy_valgrind_var--;
}
return dir;
}