Changeset 2308 for code/branches/weapon2/src/orxonox/objects/worldentities/pawns

Timestamp:

Dec 2, 2008, 7:51:46 PM (16 years ago)

Author:

polakma

Message:

made some changes

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

@@ -77 +77 @@
 
         XMLPortObject(Pawn, WeaponSlot, "weaponslots", setWeaponSlot, getWeaponSlot, xmlelement, mode);
+        XMLPortObject(Pawn, WeaponSet, "weaponsets", setWeaponSet, getWeaponSet, xmlelement, mode);
         //XMLPortObject(Pawn, WeaponPack, "weapons", setWeaponPack, getWeaponPack, xmlelement, mode);
 
@@ -153 +154 @@
     }
 
+
     void Pawn::setWeaponSlot(WeaponSlot * wSlot)
-    {
-        this->weaponSystem_->attachWeaponSlot(wSlot);
-    }
+    {   this->weaponSystem_->attachWeaponSlot(wSlot);   }
+    WeaponSlot * Pawn::getWeaponSlot(unsigned int index) const
+    {   return this->weaponSystem_->getWeaponSlotPointer(index);    }
 
-    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);
+    */
+
+    void Pawn::setWeaponSet(WeaponSet * wSet)
+    {   this->weaponSystem_->attachWeaponSet(wSet);   }
+    WeaponSet * Pawn::getWeaponSet(unsigned int index) const
+    {   return this->weaponSystem_->getWeaponSetPointer(index);    }
 
 }

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 setWeaponSet(WeaponSet * wSet);
+            WeaponSet * getWeaponSet(unsigned int index) const;
 
         protected: