Changeset 6810 for code/branches/rocket/src/modules/weapons/projectiles

Timestamp:

Apr 30, 2010, 2:34:37 PM (15 years ago)

Author:

gnadler

Message:

 

File:

• code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified) (4 diffs)

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

@@ -61 +61 @@
                 RocketController* myRController = new RocketController(this);
                 this->setController(myRController);
-                myRController->setRocket(this, myRController);
+                //myRController->setRocket(this, myRController);
                 
                 //this->getController()->setControllableEntity(this);
@@ -70 +70 @@
         if (GameMode::isMaster())
         {
-            this->setCollisionType(WorldEntity::Kinematic);
-            this->setVelocity(0,0,-100);
+         /*   this->setCollisionType(WorldEntity::Kinematic);
+            this->setVelocity(0,0,-100);*/
 
             Model* model = new Model(this);
             model->setMeshSource("Rocket.mesh");
-            model->scale(0.7f);
+            //model->scale(0.7f);
             this->attach(model);
-            ParticleEmitter* fire = new ParticleEmitter(this);
+           /* ParticleEmitter* fire = new ParticleEmitter(this);
             this->attach(fire);
             fire->setOrientation(this->getOrientation());
@@ -89 +89 @@
             collisionShape->setRadius(3);
             collisionShape->setHeight(500);
-            this->attachCollisionShape(collisionShape);
+            this->attachCollisionShape(collisionShape);*/
 
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&SimpleRocket::destroyObject, this)));
@@ -96 +96 @@
     }
 
-    /**
+    /**s
     @brief
         Destructor. Destroys controller, if present and kills sounds, if playing.