[Scummvm-git-logs] scummvm master -> 77ac364933086c3bd1f3ca90395a68a767ddb4f9

[mgerhardy]

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

Summary:
99e727c5cf TWINE: use member var directly
77ac364933 TWINE: fixed projectXYPositionOnScreen according to disassembly


Commit: 99e727c5cf52b32ba250da7bbf3ff01f88b86723
    https://github.com/scummvm/scummvm/commit/99e727c5cf52b32ba250da7bbf3ff01f88b86723
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-03-20T06:47:22+01:00

Commit Message:
TWINE: use member var directly

Changed paths:
    engines/twine/renderer/redraw.cpp


diff --git a/engines/twine/renderer/redraw.cpp b/engines/twine/renderer/redraw.cpp
index d294163aec..6a10ca0100 100644
--- a/engines/twine/renderer/redraw.cpp
+++ b/engines/twine/renderer/redraw.cpp
@@ -737,7 +737,7 @@ void Redraw::redrawEngineActions(bool bgRedraw) {
 		_engine->_screens->lockPalette = false;
 	}
 
-	if (_engine->_redraw->inSceneryView) {
+	if (inSceneryView) {
 		zoomScreenScale();
 	}
 }


Commit: 77ac364933086c3bd1f3ca90395a68a767ddb4f9
    https://github.com/scummvm/scummvm/commit/77ac364933086c3bd1f3ca90395a68a767ddb4f9
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-03-20T06:47:22+01:00

Commit Message:
TWINE: fixed projectXYPositionOnScreen according to disassembly

Changed paths:
    engines/twine/renderer/renderer.cpp


diff --git a/engines/twine/renderer/renderer.cpp b/engines/twine/renderer/renderer.cpp
index 69ac8da24c..0eea9135d5 100644
--- a/engines/twine/renderer/renderer.cpp
+++ b/engines/twine/renderer/renderer.cpp
@@ -72,11 +72,12 @@ void Renderer::projectXYPositionOnScreen(int32 x, int32 y, int32 z) {
 	}
 	int32 cz = baseRotPos.z - z;
 	if (-1 < cz) {
+		const int32 xdelta = x - baseRotPos.x;
 		int32 posZ = cz + _cameraDepthOffset;
 		if (posZ < 0) {
 			posZ = 0x7FFF;
 		}
-		projPos.x = (cz * _cameraScaleY) / posZ + _orthoProjPos.x;
+		projPos.x = (xdelta * _cameraScaleY) / posZ + _orthoProjPos.x;
 		projPos.y = y - baseRotPos.y;
 		return;
 	}