Changeset 2319 for code/branches/weapon2/src/orxonox/objects/worldentities

Timestamp:

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

Author:

polakma

Message:

fixed WeaponPack attaching

Location:

code/branches/weapon2/src/orxonox/objects/worldentities/pawns

Files:

• Pawn.cc (modified) (2 diffs)
• Pawn.h (modified) (1 diff)

code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -78 +78 @@
         XMLPortObject(Pawn, WeaponSlot, "weaponslots", setWeaponSlot, getWeaponSlot, xmlelement, mode);
         XMLPortObject(Pawn, WeaponSet, "weaponsets", setWeaponSet, getWeaponSet, xmlelement, mode);
-        //XMLPortObject(Pawn, WeaponPack, "weapons", setWeaponPack, getWeaponPack, xmlelement, mode);
+        XMLPortObject(Pawn, WeaponPack, "weapons", setWeaponPack, getWeaponPack, xmlelement, mode);
 
         }
@@ -155 +155 @@
 
 
+
     void Pawn::setWeaponSlot(WeaponSlot * wSlot)
     {   this->weaponSystem_->attachWeaponSlot(wSlot);   }
     WeaponSlot * Pawn::getWeaponSlot(unsigned int index) const
     {   return this->weaponSystem_->getWeaponSlotPointer(index);    }
-
-    /*
+    
     void Pawn::setWeaponPack(WeaponPack * wPack)
-    {   this->weaponSystem_->attachWeaponPack(wPack);   }
-    WeaponPack * Pawn::getWeaponPack(unsigned int index) const
-    {   return this->weaponSystem_->getWeaponPackPointer(index);
-    */
-
+    {   this->weaponSystem_->attachWeaponPack( wPack,wPack->getFireMode() );   }
+    WeaponPack * Pawn::getWeaponPack(unsigned int firemode) const
+    {   return this->weaponSystem_->getWeaponPackPointer(firemode);    }
+    
     void Pawn::setWeaponSet(WeaponSet * wSet)
     {   this->weaponSystem_->attachWeaponSet(wSet);   }

code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -81 +81 @@
             void setWeaponSlot(WeaponSlot * wSlot);
             WeaponSlot * getWeaponSlot(unsigned int index) const;
-         //   void setWeaponPack(WeaponPack * wPack);
-         //   WeaponPack * getWeaponPack(unsigned int index) const;
+            void setWeaponPack(WeaponPack * wPack);
+            WeaponPack * getWeaponPack(unsigned int firemode) const;
             void setWeaponSet(WeaponSet * wSet);
             WeaponSet * getWeaponSet(unsigned int index) const;