Changeset 2319 for code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc

Timestamp:

Dec 3, 2008, 3:11:48 PM (15 years ago)

Author:

polakma

Message:

fixed WeaponPack attaching

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) (4 diffs)

code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc

@@ -36 +36 @@
 
 #include "WeaponSystem.h"
-#include "WeaponPack.h"
+
 
 /* WEAPONSYSTEM
@@ -52 +52 @@
 
         this->activeWeaponSet_ = 0;
-        this->parentSpaceShip_ = 0;
+        this->parentPawn_ = 0;
     }
 
@@ -59 +59 @@
     }
 
-    void WeaponSystem::attachWeaponPack(WeaponPack *wPack, int setNumber)
+    void WeaponSystem::attachWeaponPack(WeaponPack *wPack, unsigned int firemode)
     {
-        this->weaponSets_[setNumber]->attachWeaponPack(wPack);
+        this->weaponSets_[firemode]->attachWeaponPack(wPack);
+        this->weaponPacks_[firemode] = wPack;
+        wPack->setParentWeaponSystem(this);
     }
 
@@ -125 +127 @@
     }
 
+    WeaponPack * WeaponSystem::getWeaponPackPointer(unsigned int n)
+    {
+        if (n < this->weaponPacks_.size())
+            return this->weaponPacks_[n];
+        else
+            return 0;
+    }
+
     void WeaponSystem::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {