[Scummvm-git-logs] scummvm master -> 84e41e3b64c5f73ac539df40a0fc0fbd2d0b8fec

[sev-]

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:
84e41e3b64 TWINE: More AmigaOS compilation fixes


Commit: 84e41e3b64c5f73ac539df40a0fc0fbd2d0b8fec
    https://github.com/scummvm/scummvm/commit/84e41e3b64c5f73ac539df40a0fc0fbd2d0b8fec
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-25T00:53:21+02:00

Commit Message:
TWINE: More AmigaOS compilation fixes

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


diff --git a/engines/twine/redraw.cpp b/engines/twine/redraw.cpp
index 965ab1578a..a16a160361 100644
--- a/engines/twine/redraw.cpp
+++ b/engines/twine/redraw.cpp
@@ -89,7 +89,7 @@ void Redraw::addRedrawCurrentArea(int32 left, int32 top, int32 right, int32 bott
 	currentRedrawList[i].left = left;
 	currentRedrawList[i].top = top;
 	currentRedrawList[i].right = right;
-	currentRedrawList[i].bottom = MIN(SCREEN_TEXTLIMIT_BOTTOM, bottom);
+	currentRedrawList[i].bottom = MIN<int32>(SCREEN_TEXTLIMIT_BOTTOM, bottom);
 
 	assert(currentRedrawList[i].left <= currentRedrawList[i].right);
 	assert(currentRedrawList[i].top <= currentRedrawList[i].bottom);
diff --git a/engines/twine/renderer.cpp b/engines/twine/renderer.cpp
index 95cefd2707..e26a709a66 100644
--- a/engines/twine/renderer.cpp
+++ b/engines/twine/renderer.cpp
@@ -405,7 +405,7 @@ FORCEINLINE int16 clamp(int16 x, int16 a, int16 b) {
 	return x < a ? a : (x > b ? b : x);
 }
 
-int Renderer::computePolygons() {
+int32 Renderer::computePolygons() {
 	int16 *outPtr;
 	int32 i, nVertex;
 	int8 direction, up;