[Scummvm-git-logs] scummvm master -> 9bf59ec021223ae6b5390e0c64933d8f0801c258

[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:
9bf59ec021 ICB: Attempt to fix amigaos4 build


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

Commit Message:
ICB: Attempt to fix amigaos4 build

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


diff --git a/engines/icb/gfx/gfxstub.cpp b/engines/icb/gfx/gfxstub.cpp
index d122145c86..20923386f7 100644
--- a/engines/icb/gfx/gfxstub.cpp
+++ b/engines/icb/gfx/gfxstub.cpp
@@ -57,14 +57,14 @@ OT_tag otlist[2][OT_SIZE];
 GsOT Wot[2];
 
 // The min & max places to put Z data into the OT list
-int minZOTpos = 5;
-int maxZOTpos = OT_SIZE - 5;
-int nearClip = 0;
+int32 minZOTpos = 5;
+int32 maxZOTpos = OT_SIZE - 5;
+int32 nearClip = 0;
 int32 minUsedZpos = 20000;
 int32 maxUsedZpos = 0;
 
-int otz_shift = 0; // 1cm accuracy
-int otz_offset = ((nearClip >> otz_shift) - minZOTpos);
+int32 otz_shift = 0; // 1cm accuracy
+int32 otz_offset = ((nearClip >> otz_shift) - minZOTpos);
 
 // The zones for otz_shift computation
 #define OTZ_ZONE1 32000  // 1cm
diff --git a/engines/icb/gfx/psx_scrn.h b/engines/icb/gfx/psx_scrn.h
index ab788d8c4f..8d94c5d1fc 100644
--- a/engines/icb/gfx/psx_scrn.h
+++ b/engines/icb/gfx/psx_scrn.h
@@ -101,21 +101,18 @@ extern int packetsUsed;
 
 // How much to shift & then offset the z values from gte to
 // put them into the otlist
-extern int otz_shift;
-extern int otz_offset;
+extern int32 otz_shift;
+extern int32 otz_offset;
 
 // Enable/disable updating of the auto-sliding & scaling min,max z position
 extern int update_minmaxzpos;
 
 // Global graphics options for z-clipping and camera scalings
-extern int minZOTpos;
-extern int maxZOTpos;
+extern int32 minZOTpos;
+extern int32 maxZOTpos;
 extern int32 minUsedZpos;
 extern int32 maxUsedZpos;
-extern int nearClip;
-extern int delayValue;
-extern int scale[3];
-extern int zscale;
+extern int32 nearClip;
 
 #if (_PSX_ON_PC == 0) && (_PSX == 1)