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

[grisenti]

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:
fa564564e7 HPL1: Fix incorrect declarations


Commit: fa564564e7cc1e897e75e6f7812dba5e94966250
    https://github.com/scummvm/scummvm/commit/fa564564e7cc1e897e75e6f7812dba5e94966250
Author: grisenti (emanuele at grisenti.net)
Date: 2023-09-06T22:29:06+02:00

Commit Message:
HPL1: Fix incorrect declarations

Changed paths:
    engines/hpl1/engine/impl/PhysicsBodyNewton.h
    engines/hpl1/engine/impl/PhysicsMaterialNewton.h


diff --git a/engines/hpl1/engine/impl/PhysicsBodyNewton.h b/engines/hpl1/engine/impl/PhysicsBodyNewton.h
index 979df27c9aa..7ae858eebb4 100644
--- a/engines/hpl1/engine/impl/PhysicsBodyNewton.h
+++ b/engines/hpl1/engine/impl/PhysicsBodyNewton.h
@@ -101,10 +101,10 @@ public:
 	static void SetUseCallback(bool abX) { mbUseCallback = abX; }
 
 private:
-	static int BuoyancyPlaneCallback(const int alCollisionID, void *apContext,
+	static int BuoyancyPlaneCallback(const int32 alCollisionID, void *apContext,
 									 const float *afGlobalSpaceMatrix, float *afGlobalSpacePlane);
-	static void OnTransformCallback(const NewtonBody *apBody, const dFloat *apMatrix, int);
-	static void OnUpdateCallback(NewtonBody *apBody, float, int);
+	static void OnTransformCallback(const NewtonBody *apBody, const dFloat *apMatrix, int32);
+	static void OnUpdateCallback(NewtonBody *apBody, float, int32);
 
 	NewtonBody *mpNewtonBody;
 	NewtonWorld *mpNewtonWorld;
diff --git a/engines/hpl1/engine/impl/PhysicsMaterialNewton.h b/engines/hpl1/engine/impl/PhysicsMaterialNewton.h
index 10c7df82e77..df523d1b083 100644
--- a/engines/hpl1/engine/impl/PhysicsMaterialNewton.h
+++ b/engines/hpl1/engine/impl/PhysicsMaterialNewton.h
@@ -62,8 +62,8 @@ private:
 	float Combine(ePhysicsMaterialCombMode aMode, float afX, float afY);
 
 	static int BeginContactCallback(const NewtonMaterial *material,
-									const NewtonBody *apBody1, const NewtonBody *apBody2, int);
-	static void ProcessContactCallback(const NewtonJoint *joint, float, int);
+									const NewtonBody *apBody1, const NewtonBody *apBody2, int32);
+	static void ProcessContactCallback(const NewtonJoint *joint, float, int32);
 
 	NewtonWorld *mpNewtonWorld;