Changeset 10216 for code/trunk/src/modules/weapons/projectiles/BasicProjectile.h

Timestamp:

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

Author:

landauf

Message:

merged branch presentationFS14 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/weapons/projectiles/BasicProjectile.h (modified) (1 diff)

code/trunk/src/modules/weapons/projectiles/BasicProjectile.h

@@ -119 +119 @@
 
         protected:
-            bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs);
             void destroyCheck(void);