WIP

SNMetamorph · Oct 27, 2023 · 1d6eace · 1d6eace
1 parent d4e3fc7
commit 1d6eace
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/server/physic.cpp b/server/physic.cpp
@@ -605,6 +605,9 @@ bool CPhysicsPushedEntities::SpeculativelyCheckPush( PhysicsPushedInfo_t &info,
 	if( bIsUnblockable )
 	{
 		pBlocker->SetAbsOrigin( pushDestPosition );
+		//if (bIsDynamic) {
+		//	WorldPhysic->SetOrigin( pBlocker, pushDestPosition );
+		//}
 	}
 	else
 	{
@@ -614,7 +617,10 @@ bool CPhysicsPushedEntities::SpeculativelyCheckPush( PhysicsPushedInfo_t &info,
 			if( !info.m_trace.fAllSolid )
 			{
 				pBlocker->SetAbsOrigin( info.m_trace.vecEndPos );
-			}
+				//if (bIsDynamic) {
+				//	WorldPhysic->SetOrigin( pBlocker, pushDestPosition );
+				}
+			//}
 			else if( pBlocker->m_iActorType == ACTOR_DYNAMIC && !info.m_bPusherIsGround && !bRotationalPush )
 			{
 				return false;
@@ -2516,7 +2522,9 @@ void SV_Physics_Pusher( CBaseEntity *pEntity )
 
 	// if the pusher has a "blocked" function, call it
 	// otherwise, just stay in place until the obstacle is gone
-	if( pBlocker ) DispatchBlocked( pEntity->edict(), pBlocker->edict() );
+	if (pBlocker) {
+		DispatchBlocked(pEntity->edict(), pBlocker->edict());
+	}
 
 	// NOTE: all the entities with MOVETYPE_PUSH now has two seperated thinks:
 	// normal regular thinking and local think (movedone)

diff --git a/server/physx/physx_impl.cpp b/server/physx/physx_impl.cpp
@@ -225,15 +225,15 @@ void CPhysicPhysX :: Update( float flTimeDelta )
 		}
 	}
 
-	HandleEvents();
-
 	m_flAccumulator += flTimeDelta;
 	while (m_flAccumulator > k_SimulationStepSize)
 	{
 		m_flAccumulator -= k_SimulationStepSize;
 		m_pScene->simulate(k_SimulationStepSize);
 		m_pScene->fetchResults(true);
 	}
+
+	HandleEvents();
 }
 
 void CPhysicPhysX :: EndFrame( void )