diff options
| author | johndoe123 | 2014-03-26 14:04:17 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
| commit | 22e898f7eb1bddc363900f4146696bf6e9d41e2f (patch) | |
| tree | d45b25cf42f6b3efeec2d14cba4a880fea06d182 /engines/illusions/actor.cpp | |
| parent | e05a7899755011f860f2b09ce6d5b4e0a15107b9 (diff) | |
| download | scummvm-rg350-22e898f7eb1bddc363900f4146696bf6e9d41e2f.tar.gz scummvm-rg350-22e898f7eb1bddc363900f4146696bf6e9d41e2f.tar.bz2 scummvm-rg350-22e898f7eb1bddc363900f4146696bf6e9d41e2f.zip | |
ILLUSIONS: Work on interaction; work on Cause related code
Diffstat (limited to 'engines/illusions/actor.cpp')
| -rw-r--r-- | engines/illusions/actor.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/illusions/actor.cpp b/engines/illusions/actor.cpp index fbc5958ecc..b2fccb1c89 100644 --- a/engines/illusions/actor.cpp +++ b/engines/illusions/actor.cpp @@ -861,15 +861,14 @@ bool Controls::getOverlappedObject(Control *control, Common::Point pt, Control * (!testControl->_actor || (testControl->_actor->_flags & 1))) { Common::Rect collisionRect; testControl->getCollisionRect(collisionRect); - debug("collisionRect(%d, %d, %d, %d)", collisionRect.left, collisionRect.top, collisionRect.right, collisionRect.bottom); - debug("pt(%d, %d)", pt.x, pt.y); + //debug("collisionRect(%d, %d, %d, %d)", collisionRect.left, collisionRect.top, collisionRect.right, collisionRect.bottom); + //debug("pt(%d, %d)", pt.x, pt.y); if (!collisionRect.isEmpty() && collisionRect.contains(pt)) { int testPriority = testControl->getPriority(); - debug("testPriority: %d; minPriority: %d", testPriority, minPriority); + //debug("testPriority: %d; minPriority: %d", testPriority, minPriority); if ((!foundControl || foundPriority < testPriority) && testPriority >= minPriority) { - debug("overlapped() %08X; pauseCtr: %d; flags: %04X", - testControl->_objectId, testControl->_pauseCtr, testControl->_flags); + //debug("overlapped() %08X; pauseCtr: %d; flags: %04X", testControl->_objectId, testControl->_pauseCtr, testControl->_flags); foundControl = testControl; foundPriority = testPriority; } @@ -877,8 +876,6 @@ bool Controls::getOverlappedObject(Control *control, Common::Point pt, Control * } } - debug("OVERLAPPED DONE\n"); - if (foundControl) { if (foundControl->_actor && foundControl->_actor->_parentObjectId && (foundControl->_actor->_flags & 0x40)) { uint32 parentObjectId = foundControl->getSubActorParent(); |