Changeset 11054 for code/branches/cpp11_v3/src/modules/weapons/projectiles/IceGunProjectile.h

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

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

code/branches/cpp11_v3/src/modules/weapons/projectiles/IceGunProjectile.h

@@ -62 +62 @@
 
         protected:
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
             static const float particleDestructionDelay_;
         private: