Changeset 2097 for code/trunk/src/orxonox/objects/weaponSystem/WeaponSet.cc

Timestamp:

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

Author:

landauf

Message:

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

File:

• code/trunk/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified) (3 diffs)

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];