Changeset 2232 for code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSlot.cc

Timestamp:

Nov 19, 2008, 7:07:36 PM (16 years ago)

Author:

polakma

Message:

added new features to munition.h and weapon.h. tried to fix projectiles (still doesn't compile)

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSlot.cc (modified) (3 diffs)

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

@@ -52 +52 @@
     }
 
-    void WeaponSlot::attachWeapon(Weapon *weaponPointer)
-    {
-        this->attachedWeapon_ = weaponPointer;
-    }
-
 
     /*sets the munition type
@@ -67 +62 @@
     }
 
+
     void WeaponSlot::fire()
     {
@@ -72 +68 @@
     }
 
+
+    //XMLPort functions
     void WeaponSlot::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
         SUPER(WeaponSlot, XMLPort, xmlelement, mode);
+        XMLPortObject(WeaponSlot, Weapon, "attached-weapon", attachWeapon, getAttachedWeapon, xmlelement, mode);
     }
 
+    void WeaponSlot::attachWeapon(Weapon *weaponPointer)
+    {   this->attachedWeapon_ = weaponPointer;   }
+
+    Weapon * WeaponSlot::getAttachedWeapon(unsigned int index) const
+    {   return this->attachedWeapon_;   }
+
+
 }