mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Fix door collisions

Browse Source
This commit is contained in:
scrawl 2015-06-26 06:40:28 +02:00
parent 882e359008
commit a44be148d8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwphysics/physicssystem.cpp
View File

@ -887,12 +887,12 @@ namespace MWPhysics
const btCollisionObjectWrapper* col0Wrap,int partId0,int index0, const btCollisionObjectWrapper* col0Wrap,int partId0,int index0,
const btCollisionObjectWrapper* col1Wrap,int partId1,int index1) const btCollisionObjectWrapper* col1Wrap,int partId1,int index1)
{ {
const btCollisionObject* collisionObject = col1Wrap->m_collisionObject; const btCollisionObject* collisionObject = col0Wrap->m_collisionObject;
#else #else
virtual btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObject* col0, int partId0, int index0, virtual btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObject* col0, int partId0, int index0,
const btCollisionObject* col1, int partId1, int index1) const btCollisionObject* col1, int partId1, int index1)
{ {
const btCollisionObject* collisionObject = col1; const btCollisionObject* collisionObject = col0;
#endif #endif
const PtrHolder* holder = static_cast<const PtrHolder*>(collisionObject->getUserPointer()); const PtrHolder* holder = static_cast<const PtrHolder*>(collisionObject->getUserPointer());
if (holder) if (holder)