diff options
Diffstat (limited to 'engines/bladerunner/scene_objects.cpp')
| -rw-r--r-- | engines/bladerunner/scene_objects.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/engines/bladerunner/scene_objects.cpp b/engines/bladerunner/scene_objects.cpp index 5eace21736..12e4e599b5 100644 --- a/engines/bladerunner/scene_objects.cpp +++ b/engines/bladerunner/scene_objects.cpp @@ -27,6 +27,8 @@ #include "bladerunner/obstacles.h" #include "bladerunner/savefile.h" #include "bladerunner/view.h" +//#include "bladerunner/scene.h" // asdf to REMOVE +//#include "bladerunner/game_constants.h" // asdf to REMOVE namespace BladeRunner { @@ -144,9 +146,9 @@ bool SceneObjects::existsOnXZ(int exceptSceneObjectId, float x, float z, bool mo if (sceneObject->isRetired) { isObstacle = false; } else if (sceneObject->isMoving) { - isObstacle = movingActorIsObstacle != 0; + isObstacle = movingActorIsObstacle; } else { - isObstacle = standingActorIsObstacle != 0; + isObstacle = standingActorIsObstacle; } } else { isObstacle = sceneObject->isObstacle; @@ -156,6 +158,21 @@ bool SceneObjects::existsOnXZ(int exceptSceneObjectId, float x, float z, bool mo float x1, y1, z1, x2, y2, z2; sceneObject->boundingBox.getXYZ(&x1, &y1, &z1, &x2, &y2, &z2); if (z1 <= zMax && z2 >= zMin && x1 <= xMax && x2 >= xMin) { +// if (sceneObject->type == kSceneObjectTypeObject) { +// Vector3 a(x1,y1,z1); +// Vector3 b(x2,y2,z2); +// Vector3 pos = _vm->_view->calculateScreenPosition(0.5 * (a + b)); +// debug("%d: %s (Clk: %s, Trg: %s, Prs: %s, Obs: %s, Mvg: %s), Pos(%02.2f,%02.2f,%02.2f)\n Bbox(%02.2f,%02.2f,%02.2f) ~ (%02.2f,%02.2f,%02.2f)\n", +// sceneObject->id - kSceneObjectOffsetObjects, +// _vm->_scene->objectGetName(sceneObject->id - kSceneObjectOffsetObjects).c_str(), +// sceneObject->isClickable? "T" : "F", +// sceneObject->isTarget? "T" : "F", +// sceneObject->isPresent? "T" : "F", +// sceneObject->isObstacle? "T" : "F", +// sceneObject->isMoving? "T" : "F", +// pos.x, pos.y, pos.z, +// a.x, a.y, a.z, b.x, b.y, b.z); +// } return true; } } |