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

[aquadran]

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:
dce0c082db ICB: Attempt to fix amigaos4 build


Commit: dce0c082db789ffcd5ef25a05cf7bec5b4644d80
    https://github.com/scummvm/scummvm/commit/dce0c082db789ffcd5ef25a05cf7bec5b4644d80
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-02-28T18:15:10+01:00

Commit Message:
ICB: Attempt to fix amigaos4 build

Changed paths:
    engines/icb/gfx/gfxstub.cpp
    engines/icb/gfx/psx_scrn.h
    engines/icb/softskin_pc.cpp


diff --git a/engines/icb/gfx/gfxstub.cpp b/engines/icb/gfx/gfxstub.cpp
index e9b02bc6e7..d122145c86 100644
--- a/engines/icb/gfx/gfxstub.cpp
+++ b/engines/icb/gfx/gfxstub.cpp
@@ -60,8 +60,8 @@ GsOT Wot[2];
 int minZOTpos = 5;
 int maxZOTpos = OT_SIZE - 5;
 int nearClip = 0;
-int minUsedZpos = 20000;
-int maxUsedZpos = 0;
+int32 minUsedZpos = 20000;
+int32 maxUsedZpos = 0;
 
 int otz_shift = 0; // 1cm accuracy
 int otz_offset = ((nearClip >> otz_shift) - minZOTpos);
diff --git a/engines/icb/gfx/psx_scrn.h b/engines/icb/gfx/psx_scrn.h
index 9a5627e9f0..ab788d8c4f 100644
--- a/engines/icb/gfx/psx_scrn.h
+++ b/engines/icb/gfx/psx_scrn.h
@@ -110,8 +110,8 @@ extern int update_minmaxzpos;
 // Global graphics options for z-clipping and camera scalings
 extern int minZOTpos;
 extern int maxZOTpos;
-extern int minUsedZpos;
-extern int maxUsedZpos;
+extern int32 minUsedZpos;
+extern int32 maxUsedZpos;
 extern int nearClip;
 extern int delayValue;
 extern int scale[3];
diff --git a/engines/icb/softskin_pc.cpp b/engines/icb/softskin_pc.cpp
index 260161084b..7de0654edd 100644
--- a/engines/icb/softskin_pc.cpp
+++ b/engines/icb/softskin_pc.cpp
@@ -71,15 +71,15 @@ int softskinPC(rap_API *rap, int poseBone, MATRIXPC *lw, SVECTORPC *local, int16
 	int32 flag;
 	uint oldPrim = rap->nBones;
 
-	int xmin = *xminLocal;
-	int ymin = *yminLocal;
-	int zmin = *zminLocal;
+	int32 xmin = *xminLocal;
+	int32 ymin = *yminLocal;
+	int32 zmin = *zminLocal;
 
-	int xmax = *xmaxLocal;
-	int ymax = *ymaxLocal;
-	int zmax = *zmaxLocal;
+	int32 xmax = *xmaxLocal;
+	int32 ymax = *ymaxLocal;
+	int32 zmax = *zmaxLocal;
 
-	int lvx, lvy, lvz;
+	int32 lvx, lvy, lvz;
 
 	if (poseBone == -1) {
 		for (i = 0; i < nNone; i++) {