[Scummvm-git-logs] scummvm master -> a19d80fe3cdd7bf2433abb577ed60e6560255c41

[mgerhardy]

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

Summary:
a19d80fe3c TWINE: fixed regression in actor movement


Commit: a19d80fe3cdd7bf2433abb577ed60e6560255c41
    https://github.com/scummvm/scummvm/commit/a19d80fe3cdd7bf2433abb577ed60e6560255c41
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-03-15T17:28:41+01:00

Commit Message:
TWINE: fixed regression in actor movement

introduced in 2597018b1ea32b1bdf7b87c978baf90b760ae4af

Changed paths:
    engines/twine/scene/movements.cpp


diff --git a/engines/twine/scene/movements.cpp b/engines/twine/scene/movements.cpp
index 4e8a2bc53d..6fbd85051c 100644
--- a/engines/twine/scene/movements.cpp
+++ b/engines/twine/scene/movements.cpp
@@ -113,15 +113,15 @@ int32 Movements::getAngleAndSetTargetActorDistance(int32 x1, int32 z1, int32 x2,
 
 	const int32 destAngle = (difZ * SCENE_SIZE_HALF) / targetActorDistance;
 
-	int32 startAngle = ANGLE_135;
-	//	stopAngle  = 0x100;
-
-	while (shadeAngleTable[startAngle] > destAngle) {
+	int32 startAngle = ANGLE_0;
+	//	stopAngle  = ANGLE_90;
+	const int16 *shadeAngleTab3(&shadeAngleTable[ANGLE_135]);
+	while (shadeAngleTab3[startAngle] > destAngle) {
 		startAngle++;
 	}
 
-	if (shadeAngleTable[startAngle] != destAngle) {
-		if ((shadeAngleTable[startAngle - 1] + shadeAngleTable[startAngle]) / 2 <= destAngle) {
+	if (shadeAngleTab3[startAngle] != destAngle) {
+		if ((shadeAngleTab3[startAngle - 1] + shadeAngleTab3[startAngle]) / 2 <= destAngle) {
 			startAngle--;
 		}
 	}