Changeset 2391 for code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.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/Weapon.cc (modified) (8 diffs)

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

@@ -39 +39 @@
     CreateFactory(Weapon);
 
-    Weapon::Weapon(BaseObject* creator) : BaseObject(creator)
+    Weapon::Weapon(BaseObject* creator) : PositionableEntity(creator)
     {
         RegisterObject(Weapon);
@@ -47 +47 @@
         this->parentWeaponSlot_ = 0;
         this->munition_ = 0;
+        this->bulletLoadingTime_ = 0;
+        this->magazineLoadingTime_ = 0;
+        this->bReloading_ = false;
     }
 
@@ -62 +65 @@
     void Weapon::setWeapon()
     {
+COUT(0) << "LaserGun::setWeapon" << std::endl;
         this->bulletLoadingTime_ = 0.5;
         this->magazineLoadingTime_ = 3.0;
         this->munition_->setMaxMagazines(100);
-        this->munition_->setMaxBullets(30);
+        this->munition_->setMaxBullets(6);
         this->munition_->fillBullets();
         this->munition_->fillMagazines();
@@ -74 +78 @@
     {
 COUT(0) << "LaserGun::fire, this=" << this << std::endl;
-        if ( this->bulletReadyToShoot_ && this->magazineReadyToShoot_ )
+        if ( this->bulletReadyToShoot_ && this->magazineReadyToShoot_ && !this->bReloading_)
         {
 COUT(0) << "LaserGun::fire - ready to shoot" << std::endl;
-
+COUT(0) << "LaserGun::fire - bullets" << this->munition_->bullets() << std::endl;
             this->bulletReadyToShoot_ = false;
-            if ( this->munition_->bullets() )
+            if ( this->munition_->bullets() > 0)
             {
                 //shoot
@@ -86 +90 @@
             }
             //if there are no bullets, but magazines
-            else if ( this->munition_->magazines() && !this->munition_->bullets() )
-            {
+            else if ( this->munition_->magazines() > 0 && this->munition_->bullets() == 0 )
+            {
+COUT(0) << "LaserGun::fire - no bullets" << std::endl;
                 this->takeMagazines();
+            }
+            else
+            {
+COUT(0) << "LaserGun::fire - no magazines" << std::endl;
+                //actions
             }
         }
@@ -94 +104 @@
         {
 COUT(0) << "LaserGun::fire - weapon not reloaded" << std::endl;
+            //actions
         }
 
@@ -102 +113 @@
     {
 COUT(0) << "Weapon::bulletTimer started" << std::endl;
+        this->bReloading_ = true;
         this->bulletReloadTimer_.setTimer( bulletLoadingTime , false , this , createExecutor(createFunctor(&Weapon::bulletReloaded)));
     }
@@ -107 +119 @@
     {
 COUT(0) << "Weapon::magazineTimer started" << std::endl;
+        this->bReloading_ = true;
         this->magazineReloadTimer_.setTimer( magazineLoadingTime , false , this , createExecutor(createFunctor(&Weapon::magazineReloaded)));
     }
 
     void Weapon::bulletReloaded()
-    { this->bulletReadyToShoot_ = true; }
+    {
+        this->bReloading_ = false;
+        this->bulletReadyToShoot_ = true;
+    }
 
     void Weapon::magazineReloaded()
-    { 
+    {
+        this->bReloading_ = false;
         this->munition_->fillBullets();
         this->magazineReadyToShoot_ = true;