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

Timestamp:

Dec 10, 2008, 5:30:39 PM (15 years ago)

Author:

polakma

Message:

fixed projectile, particle effect, reloadingTimer and magazineTimer

File:

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

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

@@ -46 +46 @@
     }
 
-    bool Munition::bullets()
+    unsigned int Munition::bullets()
     { 
         if (this->bullets_ > 0)
-            return true;
+            return bullets_;
         else
-            return false;
+            return 0;
     }
 
-    bool Munition::magazines()
+    unsigned int Munition::magazines()
     { 
         if (this->magazines_ > 0)
-            return true;
+            return magazines_;
         else
-            return false;
+            return 0;
     }
 
@@ -68 +68 @@
     { this->maxMagazines_ = amount; }
 
-    void Munition::removeBullets(unsigned int amount, Weapon * parentWeapon)
+    void Munition::removeBullets(unsigned int amount)
     {
-        if ( this->bullets_ == 0 )
-        {
-            this->removeMagazines(1);
-            parentWeapon->magazineTimer(0);
-            this->bullets_ = this->maxBullets_;
-        }
-        else
+        if ( this->bullets_ != 0 )
             this->bullets_ = this->bullets_ - amount;
     }
@@ -82 +76 @@
     void Munition::removeMagazines(unsigned int amount)
     {
-        if ( this->magazines_ == 0 )
-        {
-            if ( this->bullets_ == 0 )
-                {
-                    //no bullets and no magazines
-                }
-            else
-            {
-                //what to do when there are no more magazines?
-            }
-        }
-        else
+        if ( this->magazines_ != 0 )
             this->magazines_ = this->magazines_ - amount;
     }
@@ -120 +103 @@
     void Munition::fillBullets()
     {
+COUT(0) << "Munition::fillBullets maxBullets_=" << this->maxBullets_ << std::endl;
         this->bullets_ = this->maxBullets_;
     }
@@ -130 +114 @@
     void Munition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-
+        SUPER(Munition, XMLPort, xmlelement, mode);
     }