Changeset 2354

Timestamp:

Dec 8, 2008, 2:36:47 PM (16 years ago)

Author:

polakma

Message:

made some changes to munition attaching

Location:

code/branches/weapon2/src/orxonox/objects/weaponSystem

Files:

• Weapon.cc (modified) (1 diff)
• Weapon.h (modified) (1 diff)
• WeaponPack.cc (modified) (3 diffs)
• WeaponPack.h (modified) (2 diffs)
• weapons/LaserGun.cc (modified) (1 diff)
• weapons/LaserGun.h (modified) (1 diff)

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

@@ -111 +111 @@
 this->munitionType_ = munitionType; }
 
-    std::string Weapon::getMunitionType()
+    const std::string Weapon::getMunitionType()
     {   return this->munitionType_;  }
 
     Munition * Weapon::getAttachedMunition(std::string munitionType)
     {   
-COUT(0) << "Weapon::getAttachedMunition, parentWeaponSystem_="<< this->parentWeaponSystem_ << std::endl;   
-        this->parentWeaponSystem_->getMunitionType(munitionType);
+COUT(0) << "Weapon::getAttachedMunition, parentWeaponSystem_="<< this->parentWeaponSystem_ << std::endl;
+        this->munition_ = this->parentWeaponSystem_->getMunitionType(munitionType);
 COUT(0) << "Weapon::getAttachedMunition, munition_="<< this->munition_ << std::endl;
 return this->munition_; }

code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h

@@ -71 +71 @@
 
             void setMunitionType(std::string munitionType);
-            std::string getMunitionType();
+            const std::string getMunitionType();
 
             inline void setParentWeaponSlot(WeaponSlot *parentWeaponSlot)

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

@@ -59 +59 @@
     }
 
-    void WeaponPack::attachWeapon(Weapon *weapon)
-    {
-        this->weapons_.push_back(weapon);
-    }
-
     void WeaponPack::fire()
     {
@@ -86 +81 @@
     void WeaponPack::setFireMode(unsigned int firemode)
     {
+COUT(0) << "WeaponPack::setFireMode " << std::endl;
         this->firemode_ = firemode;
     }
@@ -97 +93 @@
     {
         weapon->setParentWeaponSystem(this->parentWeaponSystem_);
-COUT(0) << "WeaponPack::addWeapon " << weapon->getMunitionType() << std::endl;
+COUT(0) << "WeaponPack::addWeapon " << weapon << "   munition " << weapon->getMunitionType() << std::endl;
         this->weapons_.push_back(weapon);
     }
 
-    Weapon * WeaponPack::getWeapon(unsigned int index)
+    const Weapon * WeaponPack::getWeapon(unsigned int index)
     {
         return weapons_[index];

code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponPack.h

@@ -52 +52 @@
             Weapon * getWeaponPointer(unsigned int n);
             int getSize();
-            void attachWeapon(Weapon *weapon);
 
             void setFireMode(unsigned int firemode);
@@ -58 +57 @@
 
             void addWeapon(Weapon * weapon);
-            Weapon * getWeapon(unsigned int index);
+            const Weapon * getWeapon(unsigned int index);
 
             void setWeaponSystemToAllWeapons(WeaponSystem * weaponSystem);

code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc

@@ -83 +83 @@
     void LaserGun::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-
+        SUPER(LaserGun, XMLPort, xmlelement, mode);
+        XMLPortParam(LaserGun, "munitionType", setMunitionType, getMunitionType, xmlelement, mode);
     }
 
+    void LaserGun::setMunitionType(std::string munitionType)
+    {   
+COUT(0) << "LaserGun::setMunitionType (XMLPort) "<< munitionType << std::endl;
+        this->munitionType_ = munitionType; }
 
+    const std::string LaserGun::getMunitionType()
+    {   return this->munitionType_;  }
 
 }

code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.h

@@ -52 +52 @@
             void fire();
 
+            void setMunitionType(std::string munitionType);
+            const std::string getMunitionType();
+
         private:
             float speed_;