Changeset 2379 for code/branches/weapon2/src/orxonox/objects/weaponSystem/Munition.cc

Timestamp:

Dec 10, 2008, 2:38:33 PM (17 years ago)

Author:

polakma

Message:

changed Weapon::fire and munition reloading

File:

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

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

@@ -46 +46 @@
     }
 
-    unsigned int Munition::getBullets()
-    { return this->bullets_; }
+    bool Munition::bullets()
+    { 
+        if (this->bullets_ > 0)
+            return true;
+        else
+            return false;
+    }
 
-    unsigned int Munition::getMagazines()
-    { return this->magazines_; }
+    bool Munition::magazines()
+    { 
+        if (this->magazines_ > 0)
+            return true;
+        else
+            return false;
+    }
 
     void Munition::setMaxBullets(unsigned int amount)
@@ -60 +70 @@
     void Munition::removeBullets(unsigned int amount, Weapon * parentWeapon)
     {
-        //if actual magazine is empty, decrement it and set the bullets amount to full (masBullets_)
         if ( this->bullets_ == 0 )
         {
             this->removeMagazines(1);
-            parentWeapon->magazineTimer();
+            parentWeapon->magazineTimer(0);
             this->bullets_ = this->maxBullets_;
         }
@@ -85 +94 @@
         }
         else
-            this->magazines_ = this->magazines_ - amount; }
+            this->magazines_ = this->magazines_ - amount;
+    }
 
     void Munition::addBullets(unsigned int amount)
@@ -108 +118 @@
 
 
+    void Munition::fillBullets()
+    {
+        this->bullets_ = this->maxBullets_;
+    }
+    
+    void Munition::fillMagazines()
+    {
+        this->magazines_ = this->maxMagazines_;
+    }
+    
     void Munition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {