diff options
| author | Max Horn | 2002-06-04 23:32:53 +0000 |
|---|---|---|
| committer | Max Horn | 2002-06-04 23:32:53 +0000 |
| commit | d35eed21f1cbd769bdad4e3028d16361c7bf9f74 (patch) | |
| tree | 3d38928c8c0f89bdbc51dd660cdb79da4b5e30c6 /object.cpp | |
| parent | 31a2efd89cdae6f8722af77177dba2a7763a94a5 (diff) | |
| download | scummvm-rg350-d35eed21f1cbd769bdad4e3028d16361c7bf9f74.tar.gz scummvm-rg350-d35eed21f1cbd769bdad4e3028d16361c7bf9f74.tar.bz2 scummvm-rg350-d35eed21f1cbd769bdad4e3028d16361c7bf9f74.zip | |
more Actor class cleanup; renamed unkRoomFunc4 to palManipulate and added an icky, wrong implementation for it - yes this is complete nonsense but I'll try to replace it with the right thing RSN :-)
svn-id: r4404
Diffstat (limited to 'object.cpp')
| -rw-r--r-- | object.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/object.cpp b/object.cpp index ca09c6b33e..63776d83a0 100644 --- a/object.cpp +++ b/object.cpp @@ -224,8 +224,8 @@ int Scumm::getObjActToObjActDist(int a, int b) if (b < NUM_ACTORS) actb = derefActorSafe(b, "getObjActToObjActDist(2)"); - if (acta && actb && acta->room == actb->room && acta->room && - acta->room != _currentRoom) + if (acta && actb && acta->getRoom() == actb->getRoom() && acta->getRoom() && + !acta->isInCurrentRoom()) return 0; if (getObjectOrActorXY(a) == -1) @@ -238,7 +238,7 @@ int Scumm::getObjActToObjActDist(int a, int b) return 0xFF; if (acta) { - AdjustBoxResult r = adjustXYToBeInBox(acta, _xPos, _yPos, 0); + AdjustBoxResult r = acta->adjustXYToBeInBox(_xPos, _yPos, 0); _xPos = r.x; _yPos = r.y; } |