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

Timestamp:

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

Author:

polakma

Message:

fixed projectile, particle effect, reloadingTimer and magazineTimer

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified) (3 diffs)

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

@@ -44 +44 @@
     {
         RegisterObject(LaserGun);
+
+        //in future XMLPort
+        this->speed_ = 250;
+
     }
 
@@ -52 +56 @@
     void LaserGun::takeBullets()
     {
-        this->munition_->removeBullets(1,this);
+COUT(0) << "LaserGun::takeBullets" << std::endl;
+        this->munition_->removeBullets(1);
         this->bulletTimer(this->bulletLoadingTime_);
     }
@@ -64 +69 @@
     void LaserGun::createProjectile()
     {
+COUT(0) << "LaserGun::createProjectile" << std::endl;
         BillboardProjectile* projectile = new ParticleProjectile(this);
-        projectile->setOrientation(projectile->getOrientation());
-        projectile->setPosition(projectile->getWorldPosition());
+        projectile->setOrientation(this->getWorldOrientation());
+        projectile->setPosition(this->getWorldPosition());
         projectile->setVelocity(WorldEntity::FRONT * this->speed_);
     }