[Scummvm-cvs-logs] scummvm master -> 7b4ab3c42655207e4d7cf2174703c56b22fc27c3

[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:
7b4ab3c426 SCUMM HE: Fix int32 vs int


Commit: 7b4ab3c42655207e4d7cf2174703c56b22fc27c3
    https://github.com/scummvm/scummvm/commit/7b4ab3c42655207e4d7cf2174703c56b22fc27c3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-30T22:08:26+02:00

Commit Message:
SCUMM HE: Fix int32 vs int

Changed paths:
    engines/scumm/he/moonbase/moonbase_fow.cpp



diff --git a/engines/scumm/he/moonbase/moonbase_fow.cpp b/engines/scumm/he/moonbase/moonbase_fow.cpp
index 0c29d57..2cd17a8 100644
--- a/engines/scumm/he/moonbase/moonbase_fow.cpp
+++ b/engines/scumm/he/moonbase/moonbase_fow.cpp
@@ -225,16 +225,16 @@ void Moonbase::setFOWInfo(int fowInfoArray, int downDim, int acrossDim, int view
 
 	int dataOffset = (_fowVw * 3);
 	int dataOffset2 = (dataOffset * 2);
-	int *pOutterRenderTableA = _fowRenderTable;
-	int *pOutterRenderTableB = pOutterRenderTableA + dataOffset;
+	int32 *pOutterRenderTableA = _fowRenderTable;
+	int32 *pOutterRenderTableB = pOutterRenderTableA + dataOffset;
 
 	for (int ay = 0; ay < _fowVh; ay++) {
 		int l = il;
 		int c = ic;
 		int r = ir;
 
-		int *pRenderTableA = pOutterRenderTableA;
-		int *pRenderTableB = pOutterRenderTableB;
+		int32 *pRenderTableA = pOutterRenderTableA;
+		int32 *pRenderTableB = pOutterRenderTableB;
 
 		pOutterRenderTableA += dataOffset2;
 		pOutterRenderTableB += dataOffset2;
@@ -358,7 +358,7 @@ void Moonbase::renderFOW(uint8 *destSurface, int dstPitch, int dstType, int dstw
 	if (!_fowImage)
 		return;
 
-	const int *pOutterRenderTable = _fowRenderTable;
+	const int32 *pOutterRenderTable = _fowRenderTable;
 	int ixPos = ((_fowVtx1 * _fowTileW) - _fowMvx) + _fowDrawX;
 	int yPos = ((_fowVty1 * _fowTileH) - _fowMvy) + _fowDrawY;
 	int dataOffset = _fowVw * 3;
@@ -370,7 +370,7 @@ void Moonbase::renderFOW(uint8 *destSurface, int dstPitch, int dstType, int dstw
 		int real_yPos = yPos;
 
 		for (int i = 0; i < 2; i++) {
-			const int *pRenderTable = pOutterRenderTable;
+			const int32 *pRenderTable = pOutterRenderTable;
 			pOutterRenderTable += dataOffset;
 
 			int xPos = ixPos;