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

Timestamp:

Dec 9, 2008, 5:44:34 PM (16 years ago)

Author:

polakma

Message:

fixed some pointer bugs

File:

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

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

@@ -44 +44 @@
     {
         RegisterObject(LaserGun);
-
-        //set weapon properties here
-        //this->setLoadingTime(0.5);
-
-COUT(0) << "LaserGun::LaserGun" << std::endl;
-        this->attachNeededMunition(this->getMunitionType());
     }
 
@@ -58 +52 @@
     void LaserGun::fire()
     {
-COUT(0) << "LaserGun::fire" << std::endl;
+COUT(0) << "LaserGun::fire, this=" << this << std::endl;
         if ( this->getBulletReadyToShoot() && this->getMagazineReadyToShoot() )
         {
@@ -81 +75 @@
     }
 
-    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_;  }
-
 }