Changeset 11054 for code/branches/cpp11_v3/src/orxonox/items/ShipPart.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/orxonox/items/ShipPart.h (modified) (1 diff)

code/branches/cpp11_v3/src/orxonox/items/ShipPart.h

@@ -47 +47 @@
             virtual ~ShipPart();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             virtual void handleHit(float damage, float healthdamage, float shielddamage, Pawn* originator);