Changeset 10391 for code/branches/weaponFS15/src/modules/weapons/weaponmodes

Timestamp:

Apr 23, 2015, 4:19:02 PM (10 years ago)

Author:

meggiman

Message:

Implemented all necessary classes. No the weapon works without bugs.

Location:

code/branches/weaponFS15/src/modules/weapons/weaponmodes

Files:

• GravityBombFire.cc (modified) (2 diffs)
• GravityBombFire.h (modified) (1 diff)

code/branches/weaponFS15/src/modules/weapons/weaponmodes/GravityBombFire.cc

@@ -26 +26 @@
                 this->bParallelReload_ = false;
                 this->damage_ = 0.0f;
-                this->speed_ = 200.0f;
-                this->slowDownRate_ = -10.0f;
+                this->speed_ = 100.0f;
 
                 this->setMunitionName("GravityBombMunition");
@@ -41 +40 @@
         bomb->setOrientation(this->getMuzzleOrientation());
         bomb->setPosition(this->getMuzzlePosition());
-        bomb->setVelocity(this->getMuzzleDirection() * this->speed_);
-        bomb->setAcceleration(this->getMuzzleDirection()* this->slowDownRate_);
+        bomb->setVelocity(this->getMuzzleDirection() * (this->speed_+this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getVelocity().length()));
 
         bomb->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());

code/branches/weaponFS15/src/modules/weapons/weaponmodes/GravityBombFire.h

@@ -58 +58 @@
         private:
             float speed_; //!< The initial speed of the bomb when it is launched.
-            float slowDownRate_;
     };
 }