Changeset 6900 for code/branches/rocket/src/modules/weapons/weaponmodes

Timestamp:

May 14, 2010, 12:41:04 PM (15 years ago)

Author:

gnadler

Message:

rockentcontroller doesn't control the rocket it spawns itself.
Rocket collides wih asteroids& at least drones but does not despawn.

File:

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

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

@@ -61 +61 @@
     void SimpleRocketFire::fire()
     {
-        //SimpleRocket* rocket = new SimpleRocket(this);
                 RocketController* con = new RocketController(this);
                 SimpleRocket* rocket = con->getRocket();
@@ -69 +68 @@
         rocket->setPosition(pos);
                 rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
-                //Ogre::Vector3 vec = this->getMuzzlePosition();
-                //vec.normalise();
-                //rocket->setAcceleration(100*vec);
                 rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
-                //con->getRocket()->setPosition(this->getMuzzlePosition());
-        //con->setControllableEntity(dynamic_cast<rocket*>(ControllableEntity));
-        //con->getControllableEntity()->setPosition(this->getMuzzlePosition());
-
-        /* this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
-        rocket->setOrientation(this->getMuzzleOrientation());
-        rocket->setPosition(this->getMuzzlePosition());
-                rocket->scale(10);
-        rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
-        rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
-        rocket->setDamage(this->getDamage()); 
-        rocket->scale(2);
-                */
     }
 }