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

[sev-]

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:
8ebeb2b5f2 TWINE: Fix more int vs int32 type mismatches
b650bf01ba TWINE: Fix warning


Commit: 8ebeb2b5f2858417697a7c96039638dbe75b3217
    https://github.com/scummvm/scummvm/commit/8ebeb2b5f2858417697a7c96039638dbe75b3217
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-24T21:49:03+02:00

Commit Message:
TWINE: Fix more int vs int32 type mismatches

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


diff --git a/engines/twine/redraw.cpp b/engines/twine/redraw.cpp
index 060d64799a..965ab1578a 100644
--- a/engines/twine/redraw.cpp
+++ b/engines/twine/redraw.cpp
@@ -76,7 +76,7 @@ void Redraw::addRedrawCurrentArea(int32 left, int32 top, int32 right, int32 bott
 			currentRedrawList[i].left = leftValue;
 			currentRedrawList[i].top = topValue;
 			currentRedrawList[i].right = rightValue;
-			currentRedrawList[i].bottom = MIN(SCREEN_TEXTLIMIT_BOTTOM, bottomValue);
+			currentRedrawList[i].bottom = MIN<int32>(SCREEN_TEXTLIMIT_BOTTOM, bottomValue);
 
 			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 890aa6c32a..0074d5e448 100644
--- a/engines/twine/renderer.cpp
+++ b/engines/twine/renderer.cpp
@@ -343,7 +343,7 @@ void Renderer::processTranslatedElement(int32 rotX, int32 rotY, int32 rotZ, elem
 			dest[i] = source[i];
 	}
 
-	applyPointsTranslation(pointsPtr + elemPtr->firstPoint, elemPtr->numOfPoints, &computedPoints[elemPtr->firstPoint / 6], (int *)currentMatrixTableEntry);
+	applyPointsTranslation(pointsPtr + elemPtr->firstPoint, elemPtr->numOfPoints, &computedPoints[elemPtr->firstPoint / 6], (int32 *)currentMatrixTableEntry);
 }
 
 void Renderer::translateGroup(int16 ax, int16 bx, int16 cx) {
@@ -1645,7 +1645,7 @@ void Renderer::prepareIsoModel(uint8 *bodyPtr) { // loadGfxSub
 	}
 }
 
-int Renderer::renderIsoModel(int32 X, int32 Y, int32 Z, int32 angleX, int32 angleY, int32 angleZ, uint8 *bodyPtr) { // AffObjetIso
+int32 Renderer::renderIsoModel(int32 X, int32 Y, int32 Z, int32 angleX, int32 angleY, int32 angleZ, uint8 *bodyPtr) { // AffObjetIso
 	uint8 *ptr;
 	int16 bodyHeader;
 


Commit: b650bf01bad16ffac6f86c80bb42b44fbcdb2349
    https://github.com/scummvm/scummvm/commit/b650bf01bad16ffac6f86c80bb42b44fbcdb2349
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-24T21:49:42+02:00

Commit Message:
TWINE: Fix warning

Changed paths:
    engines/twine/renderer.cpp


diff --git a/engines/twine/renderer.cpp b/engines/twine/renderer.cpp
index 0074d5e448..95cefd2707 100644
--- a/engines/twine/renderer.cpp
+++ b/engines/twine/renderer.cpp
@@ -718,7 +718,8 @@ void Renderer::renderPolygons(int32 renderType, int32 color) {
 						*(out2) = (*(out2)&0x0F0F) | bx;
 					}
 				} else {
-					*(out2++) = (*(out2)&0x0F) | color;
+					*(out2) = (*(out2)&0x0F) | color;
+					out2++;
 				}
 			}
 			out += 640;