[Scummvm-git-logs] scummvm master -> 903ae27f86a90a825783593c8bffd20a75ae21ba

[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:
903ae27f86 HPL1: Use portable data types


Commit: 903ae27f86a90a825783593c8bffd20a75ae21ba
    https://github.com/scummvm/scummvm/commit/903ae27f86a90a825783593c8bffd20a75ae21ba
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-12-23T20:47:20+01:00

Commit Message:
HPL1: Use portable data types

Changed paths:
    engines/hpl1/engine/libraries/newton/Newton.cpp
    engines/hpl1/engine/libraries/newton/Newton.h
    engines/hpl1/engine/libraries/newton/core/dgTypes.h


diff --git a/engines/hpl1/engine/libraries/newton/Newton.cpp b/engines/hpl1/engine/libraries/newton/Newton.cpp
index 7b3560abf3a..9a40fa83900 100644
--- a/engines/hpl1/engine/libraries/newton/Newton.cpp
+++ b/engines/hpl1/engine/libraries/newton/Newton.cpp
@@ -3710,7 +3710,7 @@ int NewtonTreeCollisionGetVertexListIndexListInAABB(
 NewtonCollision *NewtonCreateHeightFieldCollision(
     NewtonWorld *const newtonWorld, int width, int height,
     int cellsDiagonals, const unsigned short *const elevationMap,
-    const char *const atributeMap, dFloat horizontalScale, dFloat verticalScale,
+    const int8 *const atributeMap, dFloat horizontalScale, dFloat verticalScale,
     int shapeID) {
 	Newton *world;
 	dgCollision *collision;
diff --git a/engines/hpl1/engine/libraries/newton/Newton.h b/engines/hpl1/engine/libraries/newton/Newton.h
index 6b49ac94310..e761b824536 100644
--- a/engines/hpl1/engine/libraries/newton/Newton.h
+++ b/engines/hpl1/engine/libraries/newton/Newton.h
@@ -22,6 +22,8 @@
 #ifndef __NEWTON_H_INCLUDED__
 #define __NEWTON_H_INCLUDED__
 
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+#include "common/scummsys.h"
 
 #define NEWTON_MAJOR_VERSION 2
 #define NEWTON_MINOR_VERSION 36
@@ -596,7 +598,7 @@ NEWTON_API void NewtonCollisionGetInfo(const NewtonCollision *const collision, N
 //
 // **********************************************************************************************
 NEWTON_API NewtonCollision *NewtonCreateHeightFieldCollision(NewtonWorld *const newtonWorld, int width, int height, int gridsDiagonals,
-        const unsigned short *const elevationMap, const char *const attributeMap,
+        const unsigned short *const elevationMap, const int8 *const attributeMap,
         dFloat horizontalScale, dFloat verticalScale, int shapeID);
 NEWTON_API void NewtonHeightFieldSetUserRayCastCallback(NewtonCollision *const treeCollision, NewtonHeightFieldRayCastCallback rayHitCallback);
 
diff --git a/engines/hpl1/engine/libraries/newton/core/dgTypes.h b/engines/hpl1/engine/libraries/newton/core/dgTypes.h
index daba0aca367..83eef5b7351 100644
--- a/engines/hpl1/engine/libraries/newton/core/dgTypes.h
+++ b/engines/hpl1/engine/libraries/newton/core/dgTypes.h
@@ -22,6 +22,9 @@
 #ifndef AFX_DGTYPES__42YH_HY78GT_YHJ63Y__INCLUDED_
 #define AFX_DGTYPES__42YH_HY78GT_YHJ63Y__INCLUDED_
 
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+#include "common/scummsys.h"
+
 #include <ctype.h>
 #include <math.h>
 #include <new>
@@ -144,18 +147,17 @@
 #define DG_GCC_VECTOR_ALIGMENT __attribute__((aligned(16)))
 #endif
 
-typedef char dgInt8;
-typedef unsigned char dgUnsigned8;
+typedef int8 dgInt8;
+typedef uint8 dgUnsigned8;
 
-typedef short dgInt16;
-typedef unsigned short dgUnsigned16;
+typedef int16 dgInt16;
+typedef uint16 dgUnsigned16;
 
-typedef int dgInt32;
-typedef unsigned dgUnsigned32;
-typedef unsigned int dgUnsigned32;
+typedef int32 dgInt32;
+typedef uint32 dgUnsigned32;
 
-typedef long long dgInt64;
-typedef unsigned long long dgUnsigned64;
+typedef int64 dgInt64;
+typedef uint64 dgUnsigned64;
 
 typedef double dgFloat64;