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

Timestamp:

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

Author:

polakma

Message:

changed Weapon::fire and munition reloading

File:

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

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

@@ -60 +60 @@
     }
 
+    void Weapon::setWeapon()
+    {
+        this->bulletLoadingTime_ = 0.5;
+        this->magazineLoadingTime_ = 3.0;
+        this->munition_->setMaxMagazines(100);
+        this->munition_->setMaxBullets(30);
+        this->munition_->fillBullets();
+        this->munition_->fillMagazines();
+    }
+
+
     void Weapon::fire()
     {
+COUT(0) << "LaserGun::fire, this=" << this << std::endl;
+        if ( this->bulletReadyToShoot_ && this->magazineReadyToShoot_ )
+        {
+COUT(0) << "LaserGun::fire - ready to shoot" << std::endl;
+
+            this->bulletReadyToShoot_ = false;
+            if ( this->munition_->bullets() )
+            {
+                //shoot
+                this->takeBullets();
+                this->createProjectile();
+            }
+            //if there are no bullets, but magazines
+            else if ( this->munition_->magazines() && !this->munition_->bullets() )
+            {
+                this->takeMagazines();
+            }
+        }
+        else
+        {
+COUT(0) << "LaserGun::fire - weapon not reloaded" << std::endl;
+        }
 
     }
 
 
-    void Weapon::bulletTimer()
+    void Weapon::bulletTimer(float bulletLoadingTime)
     {
-        this->bulletReloadTimer_.setTimer( this->bulletLoadingTime_ , false , this , createExecutor(createFunctor(&Weapon::bulletReloaded)));
+COUT(0) << "Weapon::bulletTimer started" << std::endl;
+        this->bulletReloadTimer_.setTimer( bulletLoadingTime , false , this , createExecutor(createFunctor(&Weapon::bulletReloaded)));
     }
-    void Weapon::magazineTimer()
+    void Weapon::magazineTimer(float magazineLoadingTime)
     {
-        this->magazineReloadTimer_.setTimer( this->magazineLoadingTime_ , false , this , createExecutor(createFunctor(&Weapon::magazineReloaded)));
+COUT(0) << "Weapon::magazineTimer started" << std::endl;
+        this->magazineReloadTimer_.setTimer( magazineLoadingTime , false , this , createExecutor(createFunctor(&Weapon::magazineReloaded)));
     }
 
@@ -79 +114 @@
 
     void Weapon::magazineReloaded()
-    { this->magazineReadyToShoot_ = true; }
+    { 
+        this->munition_->fillBullets();
+        this->magazineReadyToShoot_ = true;
+    }
 
 
@@ -104 +142 @@
 
 
-    /*get and set functions
+     /*get and set functions
      *
      */
@@ -123 +161 @@
 return this->munition_; }
 
+
+
     void Weapon::setBulletLoadingTime(float loadingTime)
     {   this->bulletLoadingTime_ = loadingTime;   }
@@ -135 +175 @@
     {   return this->magazineLoadingTime_;  }
 
-    void Weapon::setBulletReadyToShoot(bool b)
-    {   this->bulletReadyToShoot_ = b;   }
-
-    bool Weapon::getBulletReadyToShoot()
-    {   return this->bulletReadyToShoot_;    }
-
-    void Weapon::setMagazineReadyToShoot(bool b)
-    {   this->magazineReadyToShoot_ = b;   }
-
-    bool Weapon::getMagazineReadyToShoot()
-    {   return this->magazineReadyToShoot_;    }
 
     Timer<Weapon> * Weapon::getBulletTimer()
@@ -152 +181 @@
     Timer<Weapon> * Weapon::getMagazineTimer()
     {   return &this->magazineReloadTimer_;   }
+
+    void Weapon::takeBullets() { };
+    void Weapon::createProjectile() { };
+    void Weapon::takeMagazines() { };
+
 }