Changeset 9667 for code/trunk/src/modules/weapons/munitions

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 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)
• src/modules/weapons/munitions/FusionMunition.h (modified) (1 diff)
• src/modules/weapons/munitions/LaserMunition.cc (modified) (1 diff)
• src/modules/weapons/munitions/LaserMunition.h (modified) (1 diff)
• src/modules/weapons/munitions/ReplenishingMunition.cc (modified) (1 diff)
• src/modules/weapons/munitions/ReplenishingMunition.h (modified) (1 diff)
• src/modules/weapons/munitions/RocketMunition.cc (modified) (1 diff)
• src/modules/weapons/munitions/RocketMunition.h (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);

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

@@ -51 +51 @@
     {
         public:
-            FusionMunition(BaseObject* creator);
+            FusionMunition(Context* context);
             virtual ~FusionMunition() {}
     };

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

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

code/trunk/src/modules/weapons/munitions/LaserMunition.h

@@ -51 +51 @@
     {
         public:
-            LaserMunition(BaseObject* creator);
+            LaserMunition(Context* context);
             virtual ~LaserMunition() {}
     };

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

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

code/trunk/src/modules/weapons/munitions/ReplenishingMunition.h

@@ -53 +53 @@
     {
         public:
-            ReplenishingMunition(BaseObject* creator);
+            ReplenishingMunition(Context* context);
             virtual ~ReplenishingMunition() {}
 

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

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

code/trunk/src/modules/weapons/munitions/RocketMunition.h

@@ -51 +51 @@
     {
         public:
-            RocketMunition(BaseObject* creator);
+            RocketMunition(Context* context);
             virtual ~RocketMunition() {}
     };