Explorar o código

Merge pull request #1377 from rgngl/physicsRemoveFix

Nullify second object in CollisionPair before notifying listeners after removal
Sean Taylor %!s(int64=12) %!d(string=hai) anos
pai
achega
7dd9414b27
Modificáronse 1 ficheiros con 2 adicións e 1 borrados
  1. 2 1
      gameplay/src/PhysicsController.cpp

+ 2 - 1
gameplay/src/PhysicsController.cpp

@@ -551,7 +551,8 @@ void PhysicsController::update(float elapsedTime)
                 size_t size = iter->second._listeners.size();
                 size_t size = iter->second._listeners.size();
                 for (size_t i = 0; i < size; i++)
                 for (size_t i = 0; i < size; i++)
                 {
                 {
-                    iter->second._listeners[i]->collisionEvent(PhysicsCollisionObject::CollisionListener::NOT_COLLIDING, iter->first);
+                    PhysicsCollisionObject::CollisionPair cp(iter->first.objectA, NULL);
+                    iter->second._listeners[i]->collisionEvent(PhysicsCollisionObject::CollisionListener::NOT_COLLIDING, cp);
                 }
                 }
             }
             }