NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GamePhysics' into GameLogic

This commit is contained in:
Erik Persson 2014-02-12 11:03:33 +01:00
parent 7394f68769 5d29979875
commit 9f64a1b441
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Code/GamePhysics/Implementation/PhysicsAPI_Impl.h
View File

@ -35,13 +35,13 @@ namespace Oyster
if(colObj0->m_collisionObject == &body) if(colObj0->m_collisionObject == &body)
{ {
pt = cp.m_localPointA; pt = cp.m_localPointA;
this->func((ICustomBody*)(colObj0->getCollisionObject()->getUserPointer()), this->args); this->func((ICustomBody*)(colObj1->getCollisionObject()->getUserPointer()), this->args);
} }
else else
{ {
assert(colObj1->m_collisionObject == &body && "Body does not match either collision object"); assert(colObj1->m_collisionObject == &body && "Body does not match either collision object");
pt = cp.m_localPointB; pt = cp.m_localPointB;
this->func((ICustomBody*)(colObj1->getCollisionObject()->getUserPointer()), this->args); this->func((ICustomBody*)(colObj0->getCollisionObject()->getUserPointer()), this->args);
} }
return 0; return 0;