Changeset 2097 for code/trunk

Timestamp:

Nov 1, 2008, 10:27:12 PM (16 years ago)

Author:

landauf

Message:

adopted weapon classes to the new hierarchy (with a creator pointer)

Location:

code/trunk/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• objects/WeaponSystem.cc (modified) (2 diffs)
• objects/WeaponSystem.h (modified) (1 diff)
• objects/weaponSystem/Munition.cc (modified) (1 diff)
• objects/weaponSystem/Munition.h (modified) (1 diff)
• objects/weaponSystem/Weapon.cc (modified) (2 diffs)
• objects/weaponSystem/Weapon.h (modified) (1 diff)
• objects/weaponSystem/WeaponSet.cc (modified) (3 diffs)
• objects/weaponSystem/WeaponSet.h (modified) (1 diff)
• objects/weaponSystem/WeaponSlot.cc (modified) (1 diff)
• objects/weaponSystem/WeaponSlot.h (modified) (1 diff)
• objects/weaponSystem/munitions/LaserGunMunition.cc (modified) (1 diff)
• objects/weaponSystem/munitions/LaserGunMunition.h (modified) (1 diff)
• objects/weaponSystem/weapons/LaserGun.cc (modified) (1 diff)
• objects/weaponSystem/weapons/LaserGun.h (modified) (1 diff)
• objects/weaponSystem/weapons/Missile.cc (modified) (1 diff)
• objects/weaponSystem/weapons/Missile.h (modified) (1 diff)

code/trunk/src/orxonox/CMakeLists.txt

@@ -85 +85 @@
   objects/quest/Rewardable.cc
 
+  objects/WeaponSystem.cc
+  objects/weaponSystem/WeaponSet.cc
+  objects/weaponSystem/WeaponSlot.cc
+  objects/weaponSystem/Weapon.cc
+  objects/weaponSystem/Munition.cc
+
   objects/worldentities/triggers/Trigger.cc
   objects/worldentities/triggers/DistanceTrigger.cc

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

@@ -45 +45 @@
 namespace orxonox
 {
-    WeaponSystem::WeaponSystem()
+    WeaponSystem::WeaponSystem(BaseObject* creator) : BaseObject(creator)
     {
         RegisterObject(WeaponSystem);
@@ -77 +77 @@
     }
 
-    WeaponSet * getWeaponSetPointer(int n)
+    WeaponSet * WeaponSystem::getWeaponSetPointer(int n)
     {
         return this->weaponSets_[n];

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

@@ -42 +42 @@
     {
         public:
-            WeaponSystem();
+            WeaponSystem(BaseObject* creator);
             virtual ~WeaponSystem();
 

code/trunk/src/orxonox/objects/weaponSystem/Munition.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    Munition::Munition()
+    Munition::Munition(BaseObject* creator) : BaseObject(creator)
     {
         RegisterObject(Munition);

code/trunk/src/orxonox/objects/weaponSystem/Munition.h

@@ -40 +40 @@
     {
         public:
-            Munition();
+            Munition(BaseObject* creator);
             virtual ~Munition();
 

code/trunk/src/orxonox/objects/weaponSystem/Weapon.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    Weapon::Weapon()
+    Weapon::Weapon(BaseObject* creator) : BaseObject(creator)
     {
         RegisterObject(Weapon);
@@ -55 +55 @@
 
     }
+
+    void Weapon::fire()
+    {
+
+    }
 }

code/trunk/src/orxonox/objects/weaponSystem/Weapon.h

@@ -40 +40 @@
     {
         public:
-            Weapon();
+            Weapon(BaseObject* creator);
             virtual ~Weapon();
 

code/trunk/src/orxonox/objects/weaponSystem/WeaponSet.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    WeaponSet::WeaponSet(int k)
+    WeaponSet::WeaponSet(BaseObject* creator, int k) : BaseObject(creator)
     {
         RegisterObject(WeaponSet);
@@ -44 +44 @@
         for (int i=0;i<k;i++)
         {
-            this->wSlotNew = new WeaponSlot();
-            attachWeaponSlot(wSlotNew);
+            attachWeaponSlot(new WeaponSlot(this));
         }
     }
@@ -69 +68 @@
     }
 
-    WeaponSlot * getWeaponSlotPointer(int n)
+    WeaponSlot * WeaponSet::getWeaponSlotPointer(int n)
     {
         return this->weaponSlots_[n];

code/trunk/src/orxonox/objects/weaponSystem/WeaponSet.h

@@ -43 +43 @@
     {
         public:
-            WeaponSet(int k);
+            WeaponSet(BaseObject* creator, int k = 0);
             virtual ~WeaponSet();
 

code/trunk/src/orxonox/objects/weaponSystem/WeaponSlot.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    WeaponSlot::WeaponSlot()
+    WeaponSlot::WeaponSlot(BaseObject* creator) : BaseObject(creator)
     {
         RegisterObject(WeaponSlot);

code/trunk/src/orxonox/objects/weaponSystem/WeaponSlot.h

@@ -43 +43 @@
     {
         public:
-            WeaponSlot();
+            WeaponSlot(BaseObject* creator);
             virtual ~WeaponSlot();
 

code/trunk/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    LaserGunMunition::LaserGunMunition()
+    LaserGunMunition::LaserGunMunition(BaseObject* creator) : BaseObject(creator)
     {
         RegisterObject(LaserGunMunition);

code/trunk/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h

@@ -40 +40 @@
     {
         public:
-            LaserGunMunition();
+            LaserGunMunition(BaseObject* creator);
             virtual ~LaserGunMunition();
 

code/trunk/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    LaserGun::LaserGun()
+    LaserGun::LaserGun(BaseObject* creator) : Weapon(creator)
     {
         RegisterObject(LaserGun);

code/trunk/src/orxonox/objects/weaponSystem/weapons/LaserGun.h

@@ -39 +39 @@
 namespace orxonox
 {
-    class _OrxonoxExport LaserGun : public BaseObject : public Weapon
+    class _OrxonoxExport LaserGun : public Weapon
     {
         public:
-            LaserGun();
+            LaserGun(BaseObject* creator);
             virtual ~LaserGun();
 

code/trunk/src/orxonox/objects/weaponSystem/weapons/Missile.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    Missile::Missile()
+    Missile::Missile(BaseObject* creator) : Weapon(creator)
     {
         RegisterObject(Missile);

code/trunk/src/orxonox/objects/weaponSystem/weapons/Missile.h

@@ -40 +40 @@
     {
         public:
-            Missile();
+            Missile(BaseObject* creator);
             virtual ~Missile();