Changeset 6813

Timestamp:

May 1, 2010, 12:37:53 PM (14 years ago)

Author:

gnadler

Message:

RocketController now creates rocket. compiles.
but rocket doesn't spawn.

Location:

code/branches/rocket/src/modules/weapons

Files:

• RocketController.cc (modified) (2 diffs)
• RocketController.h (modified) (1 diff)
• projectiles/SimpleRocket.cc (modified) (3 diffs)
• weaponmodes/SimpleRocketFire.cc (modified) (2 diffs)

code/branches/rocket/src/modules/weapons/RocketController.cc

@@ -43 +43 @@
 
         RegisterObject(RocketController);
+                SimpleRocket* rocket = new SimpleRocket(this);
+                rocket->setController(this);
+                this->setControllableEntity(dynamic_cast<ControllableEntity*> (rocket));
 
     }
@@ -69 +72 @@
         */
 
-        //void setRocket(SimpleRocket* rocket, RocketController* contr) {
-        //              contr->setControllableEntity(dynamic_cast<ControllableEntity*> rocket);
-        //}
 }

code/branches/rocket/src/modules/weapons/RocketController.h

@@ -49 +49 @@
             RocketController(BaseObject* creator);
                         virtual ~RocketController(){};
-                        void setRocket(SimpleRocket* rocket, RocketController* contr);
             
             virtual void tick(float dt);

code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -59 +59 @@
         this->lifetime_ = 100;
                 //this->camera_ = null;
-                RocketController* myRController = new RocketController(this);
-                this->setController(myRController);
+                //RocketController* myRController = new RocketController(this);
+                //this->setController(creator);
                 //myRController->setRocket(this, myRController);
                 
@@ -68 +68 @@
         //this->controllableEntity_->setController(this->controller_);
 
-        if (GameMode::isMaster())
-        {
+        //if (GameMode::isMaster())
+        //{
          /*   this->setCollisionType(WorldEntity::Kinematic);
             this->setVelocity(0,0,-100);*/
@@ -92 +92 @@
 
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&SimpleRocket::destroyObject, this)));
-        }
+       // }
 
     }

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

@@ -31 +31 @@
 #include "util/Math.h"
 #include "core/CoreIncludes.h"
-#include "weapons/projectiles/SimpleRocket.h"
+#include "weapons/RocketController.h"
 
 #include "weaponsystem/Weapon.h"
@@ -61 +61 @@
     void SimpleRocketFire::fire()
     {
-        SimpleRocket* rocket = new SimpleRocket(this);
+        //SimpleRocket* rocket = new SimpleRocket(this);
+                RocketController* con = new RocketController(this);
+
 
       /*  this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());