Changeset 10216 for code/trunk/src/modules/weapons/projectiles/Rocket.cc

Timestamp:

Jan 31, 2015, 6:03:17 PM (9 years ago)

Author:

landauf

Message:

merged branch presentationFS14 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/weapons/projectiles/Rocket.cc (modified) (1 diff)

code/trunk/src/modules/weapons/projectiles/Rocket.cc

@@ -191 +191 @@
     }
 
-    bool Rocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
-    {
-        return this->processCollision(otherObject, contactPoint);
+    bool Rocket::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
+    {
+        return this->processCollision(otherObject, contactPoint, cs);
     }