[Scummvm-git-logs] scummvm master -> 25d3b2bf5b7c972de90599dbd08d2c614bec28c3

[peterkohaut]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
eb653fbfc7 BLADERUNNER: Remove right-click walk skip
05a4464c01 BLADERUNNER: Fix tooltip frame
25d3b2bf5b BLADERUNNER: Replace assert with a debug message


Commit: eb653fbfc79da8e7b853f4f9c0c0bf5045f030ec
    https://github.com/scummvm/scummvm/commit/eb653fbfc79da8e7b853f4f9c0c0bf5045f030ec
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2019-01-08T17:32:24+01:00

Commit Message:
BLADERUNNER: Remove right-click walk skip

This feature is not in the original game and it is a bug.

Changed paths:
    engines/bladerunner/bladerunner.cpp


diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 7130ff7..bd7379e 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -1274,7 +1274,11 @@ void BladeRunnerEngine::handleMouseAction(int x, int y, bool mainButton, bool bu
 		}
 	} else if (buttonDown) {
 		if (_playerActor->inWalkLoop()) {
+			if (!_isWalkingInterruptible) {
+				return;
+			}
 			_playerActor->stopWalking(false);
+			_interruptWalking = true;
 		}
 		_combat->change();
 	}


Commit: 05a4464c01e077fe58d6c7c70d05cdc7c3546378
    https://github.com/scummvm/scummvm/commit/05a4464c01e077fe58d6c7c70d05cdc7c3546378
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2019-01-08T17:32:24+01:00

Commit Message:
BLADERUNNER: Fix tooltip frame

Text was touching bottom edge of the tooltip.

Changed paths:
    engines/bladerunner/ui/ui_image_picker.cpp


diff --git a/engines/bladerunner/ui/ui_image_picker.cpp b/engines/bladerunner/ui/ui_image_picker.cpp
index 7055fe3..cb7b61d 100644
--- a/engines/bladerunner/ui/ui_image_picker.cpp
+++ b/engines/bladerunner/ui/ui_image_picker.cpp
@@ -262,7 +262,7 @@ void UIImagePicker::drawTooltip(Graphics::Surface &surface, int x, int y) {
 		rect.left = 636 - width;
 	}
 
-	rect.bottom = height + rect.top + 1;
+	rect.bottom = height + rect.top + 2;
 	if (rect.bottom >= 480) {
 		rect.bottom = 479;
 		rect.top = 478 - height;


Commit: 25d3b2bf5b7c972de90599dbd08d2c614bec28c3
    https://github.com/scummvm/scummvm/commit/25d3b2bf5b7c972de90599dbd08d2c614bec28c3
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2019-01-08T17:37:47+01:00

Commit Message:
BLADERUNNER: Replace assert with a debug message

Replaced the assert in pathfinding code so game can be playable.

Changed paths:
    engines/bladerunner/obstacles.cpp


diff --git a/engines/bladerunner/obstacles.cpp b/engines/bladerunner/obstacles.cpp
index 62bb210b..e4deaba 100644
--- a/engines/bladerunner/obstacles.cpp
+++ b/engines/bladerunner/obstacles.cpp
@@ -213,7 +213,7 @@ bool Obstacles::mergePolygons(Polygon &polyA, Polygon &polyB) {
 		if (linePolygonIntersection(polyLine, polyPrimaryType, polySecondary, &intersectionPoint, &polySecondaryIntersectionIndex)) {
 			if (WITHIN_TOLERANCE(intersectionPoint.x, polyLine.start.x) && WITHIN_TOLERANCE(intersectionPoint.y, polyLine.start.y)) {
 				warning("Set: %d Scene: %d", _vm->_scene->getSetId(), _vm->_scene->getSceneId());
-				assert(0 && "Report instances of this to madmoose!");
+				warning("Report instances of this to madmoose!");
 				flagAddVertexToVertexList = false;
 				polyMerged.verticeCount--; // TODO(madmoose): How would this work?
 			} else {