Changeset 6951 for code/branches/presentation3/src/modules/weapons/weaponmodes

Timestamp:

May 21, 2010, 10:25:27 AM (15 years ago)

Author:

scheusso

Message:

merged rocket branch into presentation3 and cleaned up some things (mostly debug output and intendation)

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/DroneFire.cc (copied) (copied from code/branches/rocket/src/modules/weapons/weaponmodes/DroneFire.cc)
• src/modules/weapons/weaponmodes/DroneFire.h (copied) (copied from code/branches/rocket/src/modules/weapons/weaponmodes/DroneFire.h)
• src/modules/weapons/weaponmodes/SimpleRocketFire.cc (copied) (copied from code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc) (1 diff)
• src/modules/weapons/weaponmodes/SimpleRocketFire.h (copied) (copied from code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.h)

code/branches/presentation3/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -6 +6 @@
   LightningGun.cc
   RocketFire.cc
+  SimpleRocketFire.cc
 )

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

@@ -61 +61 @@
     void SimpleRocketFire::fire()
     {
-                RocketController* con = new RocketController(this);
-                SimpleRocket* rocket = con->getRocket();
-                this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
-//              rocket->setOrientation(this->getMuzzleOrientation());
+        RocketController* con = new RocketController(this);
+        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();
+        Vector3 pos = this->getMuzzlePosition();
         rocket->setPosition(pos);
-//              rocket->setAcceleration(20*rocket->getOrientation() * WorldEntity::FRONT);
-                rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
-                rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
-                rocket->setDamage(this->damage_);
-                WorldEntity* pawnn=this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getTarget();
-                if (pawnn) {
-                con->setTarget(pawnn);
-                }
+//      rocket->setAcceleration(20*rocket->getOrientation() * WorldEntity::FRONT);
+        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);
+        }
     }
 }