Changeset 9667 for code/trunk/src/modules/weapons/munitions/FusionMunition.cc

Timestamp:

Aug 25, 2013, 9:08:42 PM (12 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/weapons/munitions/FusionMunition.cc (modified) (1 diff)

code/trunk/src/modules/weapons/munitions/FusionMunition.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(FusionMunition);
+    RegisterClass(FusionMunition);
 
-    FusionMunition::FusionMunition(BaseObject* creator) : Munition(creator)
+    FusionMunition::FusionMunition(Context* context) : Munition(context)
     {
         RegisterObject(FusionMunition);