Changeset 10073 for code/branches/presentationFS14/src/modules/weapons/projectiles/Projectile.cc

Timestamp:

May 22, 2014, 2:49:16 PM (10 years ago)

Author:

smerkli

Message:

Merged modularships branch

Location:

code/branches/presentationFS14

Files:

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

code/branches/presentationFS14/src/modules/weapons/projectiles/Projectile.cc

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