From 8704207550e6506886e55e6b23868b14ffd4d8ca Mon Sep 17 00:00:00 2001
From: Peter Kohaut
Date: Mon, 19 Feb 2018 22:04:44 +0100
Subject: BLADERUNNER: McCoy script fixed

Some Coverity issues fixed
KIA script small fix to DNA evidences
Actor selection fixed (bounding box is correcly expanded)
---
 engines/bladerunner/bladerunner.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'engines/bladerunner/bladerunner.cpp')

diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 2bb8e01aaa..7a24f8da06 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -839,6 +839,9 @@ void BladeRunnerEngine::gameTick() {
 				_dialogueMenu->draw(_surfaceFront);
 			}
 
+			// TODO: remove zbuffer draw
+			// _surfaceFront.copyRectToSurface(_zbuffer->getData(), 1280, 0, 0, 640, 480);
+
 			_mouse->tick(p.x, p.y);
 			_mouse->draw(_surfaceFront, p.x, p.y);
 
@@ -857,7 +860,7 @@ void BladeRunnerEngine::gameTick() {
 				for (int i = 0; i < count; i++) {
 					SceneObjects::SceneObject *sceneObject = &_sceneObjects->_sceneObjects[_sceneObjects->_sceneObjectsSortedByDistance[i]];
 
-					BoundingBox *bbox = &sceneObject->boundingBox;
+					const BoundingBox *bbox = sceneObject->boundingBox;
 					Vector3 a, b;
 					bbox->getXYZ(&a.x, &a.y, &a.z, &b.x, &b.y, &b.z);
 					Vector3 pos = _view->calculateScreenPosition(0.5 * (a + b));
@@ -1410,7 +1413,7 @@ void BladeRunnerEngine::handleMouseClickEmpty(int x, int y, Vector3 &scenePositi
 	int actorId = Actor::findTargetUnderMouse(this, x, y);
 	int itemId = _items->findTargetUnderMouse(x, y);
 
-	if (_combat->isActive() && buttonDown && actorId > 0 && itemId > 0) {
+	if (_combat->isActive() && buttonDown && (actorId > 0 || itemId > 0)) {
 		_playerActor->stopWalking(false);
 		if (actorId > 0) {
 			_playerActor->faceActor(actorId, false);
-- 
cgit v1.2.3