mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-03-25 23:29:24 +00:00
Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into alpha41/controllerCreaceCorrections
This commit is contained in:
commit
a074146603
57 changed files with 5351 additions and 236 deletions
|
|
@ -5221,7 +5221,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 );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue