Changeset 10624 for code/trunk/src/orxonox/weaponsystem

Timestamp:

Oct 4, 2015, 9:12:21 PM (9 years ago)

Author:

landauf

Message:

merged branch core7 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/weaponsystem/WeaponMode.cc (modified) (1 diff)

code/trunk/src/orxonox/weaponsystem/WeaponMode.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    RegisterAbstractClass(WeaponMode).inheritsFrom(Class(BaseObject));
+    RegisterAbstractClass(WeaponMode).inheritsFrom<BaseObject>();
 
     WeaponMode::WeaponMode(Context* context) : BaseObject(context)