Changeset 2852 for code/branches/weaponsystem/src/orxonox/objects/weaponSystem/Weapon.cc

Timestamp:

Mar 26, 2009, 2:56:39 PM (15 years ago)

Author:

polakma

Message:

added unlimited munition, reverted shared munition and fixed some bugs

File:

• code/branches/weaponsystem/src/orxonox/objects/weaponSystem/Weapon.cc (modified) (11 diffs)

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

@@ -68 +68 @@
         XMLPortParam(Weapon, "bulletLoadingTime", setBulletLoadingTime, getBulletLoadingTime, xmlelement, mode);
         XMLPortParam(Weapon, "magazineLoadingTime", setMagazineLoadingTime, getMagazineLoadingTime, xmlelement, mode);
-        XMLPortParam(Weapon, "bSharedMunition", setSharedMunition, getSharedMunition, xmlelement, mode);
         XMLPortParam(Weapon, "bullets", setBulletAmount, getBulletAmount, xmlelement, mode);
         XMLPortParam(Weapon, "magazines", setMagazineAmount, getMagazineAmount, xmlelement, mode);
@@ -88 +87 @@
     void Weapon::fire()
     {
-COUT(0) << "Weapon::fire" << std::endl;
         if ( this->bulletReadyToShoot_ && this->magazineReadyToShoot_ && !this->bReloading_)
         {
-COUT(0) << "Weapon::fire 2" << std::endl;
             this->bulletReadyToShoot_ = false;
             if ( this->unlimitedMunition_== true )
             {
-COUT(0) << "Weapon::fire 3" << std::endl;
                 //shoot
                 this->reloadBullet();
@@ -102 +98 @@
             else
             {
-COUT(0) << "Weapon::fire 4" << std::endl;
                 if ( this->munition_->bullets() > 0)
                 {
-COUT(0) << "Weapon::fire 5" << std::endl;
-                    //shoot
+                    //shoot and reload
                     this->takeBullets();
                     this->reloadBullet();
@@ -114 +108 @@
                 else if ( this->munition_->magazines() > 0 && this->munition_->bullets() == 0 )
                 {
-COUT(0) << "Weapon::fire 6" << std::endl;
+                    //reload magazine
                     this->takeMagazines();
                     this->reloadMagazine();
@@ -126 +120 @@
         else
         {
-COUT(0) << "Weapon::fire not reloaded" << std::endl;
             //weapon not reloaded
         }
@@ -132 +125 @@
     }
 
-    /*
-    * weapon reloading
-    */
+
+    //weapon reloading
     void Weapon::bulletTimer(float bulletLoadingTime)
     {
@@ -156 +148 @@
         this->bReloading_ = false;
         this->munition_->fillBullets();
-        this->magazineReadyToShoot_ = true;
-        this->bulletReadyToShoot_ = true;
-    }
+    }
+
 
 
@@ -164 +155 @@
     {
         /*  if munition type already exists attach it, else create a new one of this type and attach it to the weapon and to the WeaponSystem
-        *   if the weapon shares one munitionType put it into sharedMunitionSet else to munitionSet
         */
         if (this->parentWeaponSystem_)
         {
-            if (this->bSharedMunition_ == false)
-            {
+            //getMunitionType returns 0 if there is no such munitionType
+            Munition* munition = this->parentWeaponSystem_->getMunitionType(munitionName);
+            if ( munition )
+            {
+                this->munition_ = munition;
+                this->setMunition();
+            }
+            else
+            {
+                //create new munition with identifier because there is no such munitionType
                 this->munitionIdentifier_ = ClassByString(munitionName);
                 this->munition_ = this->munitionIdentifier_.fabricate(this);
                 this->parentWeaponSystem_->setNewMunition(munitionName, this->munition_);
-            }
-            else
-            {
-                //getMunitionType returns 0 if there is no such munitionType
-                Munition* munition = this->parentWeaponSystem_->getMunitionType(munitionName);
-                if ( munition )
-                    this->munition_ = munition;
-                else
-                {
-                    //create new munition with identifier because there is no such munitionType
-                    this->munitionIdentifier_ = ClassByString(munitionName);
-                    this->munition_ = this->munitionIdentifier_.fabricate(this);
-                    this->parentWeaponSystem_->setNewSharedMunition(munitionName, this->munition_);
-                }
-            }
-            this->setMunition();
+                this->setMunition();
+            }
         }
     }
@@ -208 +192 @@
 
 
-     /*get and set functions
-     *
-     */
+    //get and set functions for XMLPort
     void Weapon::setMunitionType(std::string munitionType)
     {   this->munitionType_ = munitionType; }
@@ -229 +211 @@
     {   return this->magazineLoadingTime_;  }
 
-    void Weapon::setSharedMunition(bool bSharedMunition)
-    {   this->bSharedMunition_ = bSharedMunition; }
-
-    const bool Weapon::getSharedMunition()
-    {   return this->bSharedMunition_;  }
-
     void Weapon::setBulletAmount(unsigned int amount)
     {   this->bulletAmount_ = amount; }
@@ -245 +221 @@
 
     const unsigned int Weapon::getMagazineAmount()
-    {   return this->magazineAmount_;  }
+    {   return this->magazineAmount_;   }
 
     void Weapon::setUnlimitedMunition(bool unlimitedMunition)