Merge pull request #1689 from ZombieSoul/fix-physics-player-collision

Azaezel · web-flow · commit 58632d0d73e2 · 2026-03-15T09:34:06.000-05:00
Fix wrong variable in physics collision loop
diff --git a/Engine/source/T3D/player.cpp b/Engine/source/T3D/player.cpp
@@ -5169,7 +5169,7 @@ bool Player::updatePos(const F32 travelTime)
             Collision& colCheck = collisionList[i];
             if (colCheck.object)
             {
-               SceneObject* obj = static_cast<SceneObject*>(col.object);
+               SceneObject* obj = static_cast<SceneObject*>(colCheck.object);
                if (obj->getTypeMask() & PlayerObjectType)
                {
                   _handleCollision( colCheck );

Original file line number	Diff line number	Diff line change
`@@ -5169,7 +5169,7 @@ bool Player::updatePos(const F32 travelTime)`
`5169`	`5169`	`Collision& colCheck = collisionList[i];`
`5170`	`5170`	`if (colCheck.object)`
`5171`	`5171`	`{`
`5172`		`- SceneObject* obj = static_cast<SceneObject*>(col.object);`
	`5172`	`+ SceneObject* obj = static_cast<SceneObject*>(colCheck.object);`
`5173`	`5173`	`if (obj->getTypeMask() & PlayerObjectType)`
`5174`	`5174`	`{`
`5175`	`5175`	`_handleCollision( colCheck );`