Changeset 6966 for code/branches/rocket2/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

Timestamp:

May 26, 2010, 4:28:14 PM (14 years ago)

Author:

gnadler

Message:

now rocket slows and then finally stops after a given number of ticks (aka fuel).
rocket speeds up if distance is greater than x (right now 1000 but can be changed).
collisionShape not yet fixed.

File:

• code/branches/rocket2/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) (2 diffs)

code/branches/rocket2/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -46 +46 @@
         RegisterObject(SimpleRocketFire);
 
-        this->reloadTime_ = 0.20f;
+        this->reloadTime_ = 4;
         this->bParallelReload_ = false;
         this->damage_ = 100;
@@ -64 +64 @@
         SimpleRocket* rocket = con->getRocket();
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
-//      rocket->setOrientation(this->getMuzzleOrientation());
         rocket->setOrientation(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getWorldOrientation());
-        Vector3 pos = this->getMuzzlePosition();
-        rocket->setPosition(pos);
-//      rocket->setAcceleration(20*rocket->getOrientation() * WorldEntity::FRONT);
+        rocket->setPosition(this->getMuzzlePosition());
         rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
         rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         rocket->setDamage(this->damage_);
         WorldEntity* pawnn=static_cast<ControllableEntity*>(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn())->getTarget();
-        if (pawnn)
-        {
-            con->setTarget(pawnn);
-        }
+        if (pawnn) con->setTarget(pawnn);
     }
 }