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

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/orxonox/weaponsystem/DefaultWeaponmodeLink.cc (modified) (1 diff)
• src/orxonox/weaponsystem/DefaultWeaponmodeLink.h (modified) (1 diff)
• src/orxonox/weaponsystem/Munition.cc (modified) (1 diff)
• src/orxonox/weaponsystem/Munition.h (modified) (1 diff)
• src/orxonox/weaponsystem/Weapon.cc (modified) (1 diff)
• src/orxonox/weaponsystem/Weapon.h (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponMode.cc (modified) (2 diffs)
• src/orxonox/weaponsystem/WeaponMode.h (modified) (2 diffs)
• src/orxonox/weaponsystem/WeaponPack.cc (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponPack.h (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponSet.cc (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponSet.h (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponSlot.cc (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponSlot.h (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponSystem.cc (modified) (3 diffs)
• src/orxonox/weaponsystem/WeaponSystem.h (modified) (1 diff)

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

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(DefaultWeaponmodeLink);
+    RegisterClass(DefaultWeaponmodeLink);
 
-    DefaultWeaponmodeLink::DefaultWeaponmodeLink(BaseObject* creator) : BaseObject(creator)
+    DefaultWeaponmodeLink::DefaultWeaponmodeLink(Context* context) : BaseObject(context)
     {
         RegisterObject(DefaultWeaponmodeLink);

code/trunk/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h

@@ -39 +39 @@
     {
         public:
-            DefaultWeaponmodeLink(BaseObject* creator);
+            DefaultWeaponmodeLink(Context* context);
             virtual ~DefaultWeaponmodeLink();
 

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

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

code/trunk/src/orxonox/weaponsystem/Munition.h

@@ -56 +56 @@
 
         public:
-            Munition(BaseObject* creator);
+            Munition(Context* context);
             virtual ~Munition();
 

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

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

code/trunk/src/orxonox/weaponsystem/Weapon.h

@@ -42 +42 @@
     {
         public:
-            Weapon(BaseObject* creator);
+            Weapon(Context* context);
             virtual ~Weapon();
 

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

@@ -45 +45 @@
 namespace orxonox
 {
-    WeaponMode::WeaponMode(BaseObject* creator) : BaseObject(creator)
+    RegisterAbstractClass(WeaponMode).inheritsFrom(Class(BaseObject));
+
+    WeaponMode::WeaponMode(Context* context) : BaseObject(context)
     {
         RegisterObject(WeaponMode);
@@ -75 +77 @@
         if( GameMode::isMaster() )
         {
-            this->defSndWpnFire_ = new WorldSound(this);
+            this->defSndWpnFire_ = new WorldSound(this->getContext());
             this->defSndWpnFire_->setLooping(false);
             this->bSoundAttached_ = false;

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

@@ -36 +36 @@
 #include "util/Math.h"
 #include "core/BaseObject.h"
-#include "core/SubclassIdentifier.h"
+#include "core/class/SubclassIdentifier.h"
 #include "tools/Timer.h"
 
@@ -44 +44 @@
     {
         public:
-            WeaponMode(BaseObject* creator);
+            WeaponMode(Context* context);
             virtual ~WeaponMode();
 

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

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateFactory(WeaponPack);
+    RegisterClass(WeaponPack);
 
-    WeaponPack::WeaponPack(BaseObject* creator) : BaseObject(creator)
+    WeaponPack::WeaponPack(Context* context) : BaseObject(context)
     {
         RegisterObject(WeaponPack);

code/trunk/src/orxonox/weaponsystem/WeaponPack.h

@@ -41 +41 @@
     {
         public:
-            WeaponPack(BaseObject* creator);
+            WeaponPack(Context* context);
             virtual ~WeaponPack();
 

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

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

code/trunk/src/orxonox/weaponsystem/WeaponSet.h

@@ -41 +41 @@
     {
         public:
-            WeaponSet(BaseObject* creator);
+            WeaponSet(Context* context);
             virtual ~WeaponSet();
 

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

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

code/trunk/src/orxonox/weaponsystem/WeaponSlot.h

@@ -57 +57 @@
     {
         public:
-            WeaponSlot(BaseObject* creator);
+            WeaponSlot(Context* context);
             virtual ~WeaponSlot();
 

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

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/SubclassIdentifier.h"
+#include "core/class/SubclassIdentifier.h"
 #include "worldentities/pawns/Pawn.h"
 
@@ -46 +46 @@
 namespace orxonox
 {
-    CreateFactory(WeaponSystem);
-
-    WeaponSystem::WeaponSystem(BaseObject* creator) : BaseObject(creator)
+    RegisterClass(WeaponSystem);
+
+    WeaponSystem::WeaponSystem(Context* context) : BaseObject(context)
     {
         RegisterObject(WeaponSystem);
@@ -308 +308 @@
         else if (identifier->getIdentifier()->isA(Class(Munition)))
         {
-            Munition* munition = identifier->fabricate(this);
+            Munition* munition = identifier->fabricate(this->getContext());
             this->munitions_[identifier->getIdentifier()] = munition;
             return munition;

code/trunk/src/orxonox/weaponsystem/WeaponSystem.h

@@ -43 +43 @@
     {
         public:
-            WeaponSystem(BaseObject* creator);
+            WeaponSystem(Context* context);
             virtual ~WeaponSystem();