Changeset 2379 for code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons

Timestamp:

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

Author:

polakma

Message:

changed Weapon::fire and munition reloading

Location:

code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons

Files:

• LaserGun.cc (modified) (1 diff)
• LaserGun.h (modified) (1 diff)

code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc

@@ -50 +50 @@
     }
 
-    void LaserGun::fire()
+    void LaserGun::takeBullets()
     {
-COUT(0) << "LaserGun::fire, this=" << this << std::endl;
-        if ( this->getBulletReadyToShoot() && this->getMagazineReadyToShoot() )
-        {
-COUT(0) << "LaserGun::fire - ready to shoot" << std::endl;
-            //take munition
-            this->setBulletReadyToShoot(false);
-            Weapon::bulletTimer();
-            this->getAttachedMunition(this->munitionType_)->removeBullets(1,this);
-
-            //create projectile
-            BillboardProjectile* projectile = new ParticleProjectile(this);
-            projectile->setOrientation(projectile->getOrientation());
-            projectile->setPosition(projectile->getWorldPosition());
-            projectile->setVelocity(WorldEntity::FRONT * this->speed_);
-
-            //projectile->setColour(this->getProjectileColour());
-        }
-        else
-        {
-            //actions, when weapon is not reloaded if there are some
-        }
+        this->munition_->removeBullets(1,this);
+        this->bulletTimer(this->bulletLoadingTime_);
     }
 
+    void LaserGun::takeMagazines()
+    {
+        this->munition_->removeMagazines(1);
+        this->magazineTimer(this->magazineLoadingTime_);
+    }
+
+    void LaserGun::createProjectile()
+    {
+        BillboardProjectile* projectile = new ParticleProjectile(this);
+        projectile->setOrientation(projectile->getOrientation());
+        projectile->setPosition(projectile->getWorldPosition());
+        projectile->setVelocity(WorldEntity::FRONT * this->speed_);
+    }
 }

code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.h

@@ -47 +47 @@
             LaserGun(BaseObject* creator);
             virtual ~LaserGun();
-
-            void fire();
+            
+            virtual void takeBullets();
+            virtual void takeMagazines();
+            virtual void createProjectile();
 
         private: