Changeset 11054 for code/branches/cpp11_v3/src/modules/weapons/projectiles/LightningGunProjectile.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/LightningGunProjectile.h (modified) (1 diff)

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

@@ -58 +58 @@
             virtual ~LightningGunProjectile() {}
 
-            virtual void setMaterial(const std::string& material);
+            virtual void setMaterial(const std::string& material) override;
 
         private: