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

[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:
ee18f37849 HPL1: Fix incorrect types in newton callbacks


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

Commit Message:
HPL1: Fix incorrect types in newton callbacks

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


diff --git a/engines/hpl1/engine/impl/PhysicsBodyNewton.cpp b/engines/hpl1/engine/impl/PhysicsBodyNewton.cpp
index 03cee5f03eb..173bd98fbfd 100644
--- a/engines/hpl1/engine/impl/PhysicsBodyNewton.cpp
+++ b/engines/hpl1/engine/impl/PhysicsBodyNewton.cpp
@@ -415,7 +415,7 @@ void cPhysicsBodyNewton::ClearForces() {
 
 //-----------------------------------------------------------------------
 
-void cPhysicsBodyNewton::OnTransformCallback(const NewtonBody *apBody, const dFloat *apMatrix, int) {
+void cPhysicsBodyNewton::OnTransformCallback(const NewtonBody *apBody, const dFloat *apMatrix, int32) {
 	cPhysicsBodyNewton *pRigidBody = (cPhysicsBodyNewton *)NewtonBodyGetUserData(apBody);
 
 	pRigidBody->m_mtxLocalTransform.FromTranspose(apMatrix);
@@ -430,7 +430,7 @@ void cPhysicsBodyNewton::OnTransformCallback(const NewtonBody *apBody, const dFl
 
 //-----------------------------------------------------------------------
 
-int cPhysicsBodyNewton::BuoyancyPlaneCallback(const int alCollisionID, void *apContext,
+int cPhysicsBodyNewton::BuoyancyPlaneCallback(const int32 alCollisionID, void *apContext,
 											  const float *afGlobalSpaceMatrix, float *afGlobalSpacePlane) {
 	cPlanef surfacePlane = static_cast<cPhysicsBodyNewton *>(apContext)->mBuoyancy.mSurface;
 	afGlobalSpacePlane[0] = surfacePlane.a;
@@ -440,7 +440,7 @@ int cPhysicsBodyNewton::BuoyancyPlaneCallback(const int alCollisionID, void *apC
 	return 1;
 }
 
-void cPhysicsBodyNewton::OnUpdateCallback(NewtonBody *apBody, float, int) {
+void cPhysicsBodyNewton::OnUpdateCallback(NewtonBody *apBody, float, int32) {
 	float fMass;
 	float fX, fY, fZ;
 
diff --git a/engines/hpl1/engine/impl/PhysicsMaterialNewton.cpp b/engines/hpl1/engine/impl/PhysicsMaterialNewton.cpp
index ca6c9b416e0..c3d2d7fcf1c 100644
--- a/engines/hpl1/engine/impl/PhysicsMaterialNewton.cpp
+++ b/engines/hpl1/engine/impl/PhysicsMaterialNewton.cpp
@@ -207,7 +207,7 @@ float cPhysicsMaterialNewton::Combine(ePhysicsMaterialCombMode aMode, float afX,
 
 //-----------------------------------------------------------------------
 int cPhysicsMaterialNewton::BeginContactCallback(const NewtonMaterial *material,
-												 const NewtonBody *body0, const NewtonBody *body1, int) {
+												 const NewtonBody *body0, const NewtonBody *body1, int32) {
 	iPhysicsBody *contactBody0 = (cPhysicsBodyNewton *)NewtonBodyGetUserData(body0);
 	iPhysicsBody *contactBody1 = (cPhysicsBodyNewton *)NewtonBodyGetUserData(body1);
 
@@ -347,7 +347,7 @@ void ContactProcessor::endProcessing() {
 	_contactBody1->OnCollide(_contactBody0, &_contactData);
 }
 
-void cPhysicsMaterialNewton::ProcessContactCallback(const NewtonJoint *joint, float, int) {
+void cPhysicsMaterialNewton::ProcessContactCallback(const NewtonJoint *joint, float, int32) {
 	ContactProcessor processor(joint);
 
 	while (processor.processNext()) {