Changeset 2398 for code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.cc

Timestamp:

Dec 10, 2008, 9:20:39 PM (15 years ago)

Author:

polakma

Message:

altfire now available

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.cc (modified) (4 diffs)

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

@@ -45 +45 @@
         this->magazineReadyToShoot_ = true;
         this->parentWeaponSystem_ = 0;
-        this->parentWeaponSlot_ = 0;
+        this->attachedToWeaponSlot_ = 0;
         this->munition_ = 0;
         this->bulletLoadingTime_ = 0;
@@ -61 +61 @@
         SUPER(Weapon, XMLPort, xmlelement, mode);
         XMLPortParam(Weapon, "munitionType", setMunitionType, getMunitionType, xmlelement, mode);
+        XMLPortParam(Weapon, "bulletLoadingTime", setBulletLoadingTime, getBulletLoadingTime, xmlelement, mode);
+        XMLPortParam(Weapon, "magazineLoadingTime", setMagazineLoadingTime, getMagazineLoadingTime, xmlelement, mode);
     }
 
     void Weapon::setWeapon()
     {
-COUT(0) << "LaserGun::setWeapon" << std::endl;
-        this->bulletLoadingTime_ = 0.5;
-        this->magazineLoadingTime_ = 3.0;
-        this->munition_->setMaxMagazines(100);
-        this->munition_->setMaxBullets(6);
         this->munition_->fillBullets();
         this->munition_->fillMagazines();
@@ -165 +162 @@
 
     void Weapon::setMunitionType(std::string munitionType)
-    {   
-COUT(0) << "Weapon::setMunitionType (XMLPort) "<< munitionType << std::endl;
-this->munitionType_ = munitionType; }
+    {   this->munitionType_ = munitionType; }
 
     const std::string Weapon::getMunitionType()
     {   return this->munitionType_;  }
+
+    void Weapon::setBulletLoadingTime(float loadingTime)
+    {   this->bulletLoadingTime_ = loadingTime; }
+
+    const float Weapon::getBulletLoadingTime()
+    {   return this->bulletLoadingTime_;  }
+
+    void Weapon::setMagazineLoadingTime(float loadingTime)
+    {   this->magazineLoadingTime_ = loadingTime; }
+
+    const float Weapon::getMagazineLoadingTime()
+    {   return this->magazineLoadingTime_;  }
+
 
     Munition * Weapon::getAttachedMunition(std::string munitionType)
@@ -179 +187 @@
 return this->munition_; }
 
-
-
-    void Weapon::setBulletLoadingTime(float loadingTime)
-    {   this->bulletLoadingTime_ = loadingTime;   }
-
-    float Weapon::getBulletLoadingTime()
-    {   return this->bulletLoadingTime_;  }
-
-    void Weapon::setMagazineLoadingTime(float loadingTime)
-    {   this->magazineLoadingTime_ = loadingTime;   }
-
-    float Weapon::getMagazineLoadingTime()
-    {   return this->magazineLoadingTime_;  }
-
-
-    Timer<Weapon> * Weapon::getBulletTimer()
-    {   return &this->bulletReloadTimer_;   }
-
-    Timer<Weapon> * Weapon::getMagazineTimer()
-    {   return &this->magazineReloadTimer_;   }
-
     void Weapon::takeBullets() { };
     void Weapon::createProjectile() { };