Changeset 6863 for code/branches/rocket/src/modules/weapons/RocketController.cc

Timestamp:

May 7, 2010, 4:14:18 PM (14 years ago)

Author:

gnadler

Message:

orxonox crashes while, respectively after destroying either the Rocket or the Controller.

File:

• code/branches/rocket/src/modules/weapons/RocketController.cc (modified) (3 diffs)

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

@@ -48 +48 @@
                 this->rocket->setController(dynamic_cast<RocketController*>(this));
                 this->setControllableEntity(dynamic_cast<ControllableEntity*> (rocket));
+                this->haha=0;
     }
 
@@ -59 +60 @@
     void RocketController::tick(float dt)
     {
+                haha++;
 
         SimpleRocket *rocket = static_cast<SimpleRocket*>(this->getControllableEntity());
-                double rd = rand();
-                if (rd > 0.5) rocket->rotateRoll(5); 
+                rocket->setAcceleration(rocket->getAcceleration()*2);
+                if (haha < 100) rocket->rotateYaw(10);
+                else {
+                if (rand() > 0.5) rocket->rotateRoll(5); 
                 else rocket->rotatePitch(5);
+                }
 
     }
@@ -69 +74 @@
 
         RocketController::~RocketController() {
+                
                 COUT(0)<< "RocketController destroyed\n";
         }