vphysics: some bald x64 bit fixes

tyabus · Oct 1, 2023 · b886cb2 · b886cb2
1 parent aa0ce7a
commit b886cb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/vphysics/main.cpp b/vphysics/main.cpp
@@ -187,8 +187,8 @@ IPhysicsCollisionSet *CPhysicsInterface::FindOrCreateCollisionSet( uintptr_t id,
 	IPhysicsCollisionSet *pSet = FindCollisionSet( id );
 	if ( pSet )
 		return pSet;
-	int index = m_collisionSets.AddToTail();
-	m_pCollisionSetHash->add_elem( (void *)id, (void *)(index+1) );
+	intp index = m_collisionSets.AddToTail(); // 64 bit fix
+	m_pCollisionSetHash->add_elem( (void *)(intp)id, (void *)(intp)(index+1) );
 	return &m_collisionSets[index];
 }
 
@@ -198,7 +198,7 @@ IPhysicsCollisionSet *CPhysicsInterface::FindCollisionSet( uintptr_t id )
 	{
 	    //lwss - x64 fixes
 		//int index = (int)m_pCollisionSetHash->find_elem( (void *)id );
-		intptr_t index = (intptr_t)m_pCollisionSetHash->find_elem( (void*)id );
+		intptr_t index = (intptr_t)m_pCollisionSetHash->find_elem( (void*)(intp)id );
 		//lwss end
 		if ( index > 0 )
 		{

diff --git a/vphysics/physics_environment.cpp b/vphysics/physics_environment.cpp
@@ -2161,7 +2161,7 @@ class CObjectPairHash : public IPhysicsObjectPairHash
 
 		// set the high bit, so zero means "not there"
 		hash |= 0x80000000;
-		return (void *)hash;
+		return (void *)(intp)hash; //lwss x64 fix
 	}
 
 	// Lookup this object and get a multilist entry