Changeset 6815 for code/branches/rocket/src

Timestamp:

May 2, 2010, 1:39:33 PM (15 years ago)

Author:

gnadler

Message:

trying to destroy RocketController within SimpleRocket destroyer but doesn't work…

Location:

code/branches/rocket/src/modules/weapons

Files:

• RocketController.cc (modified) (3 diffs)
• projectiles/SimpleRocket.cc (modified) (3 diffs)

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

@@ -31 +31 @@
 #include "util/Math.h"
 #include "weapons/projectiles/SimpleRocket.h"
+#include "util/Debug.h"
 
 
@@ -41 +42 @@
     RocketController::RocketController(BaseObject* creator) : Controller(creator)
     {
+                COUT(0)<< "RocketController constructed\n";
 
         RegisterObject(RocketController);
@@ -69 +71 @@
 
         RocketController::~RocketController() {
-
-                delete this->getControllableEntity();
+                COUT(0)<< "RocketController destroyed\n";
+                delete this;
 
         }

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

@@ -41 +41 @@
 #include "weapons/RocketController.h"
 #include "sound/WorldSound.h"
+#include "util/Debug.h"
 
 namespace orxonox
@@ -58 +59 @@
         this->bDestroy_ = false;
         this->lifetime_ = 100;
+                COUT(0)<< "simplerocket constructed\n";
                 //this->camera_ = null;
                 //RocketController* myRController = new RocketController(this);
@@ -102 +104 @@
     SimpleRocket::~SimpleRocket()
     {
+                COUT(0)<< "simplerocket destroyed\n";
+                delete this->getController();
     }