[Orxonox-commit 2099] r6815 - in code/branches/rocket/src/modules/weapons: . projectiles

[gnadler at orxonox.net]

Author: gnadler
Date: 2010-05-02 13:39:33 +0200 (Sun, 02 May 2010)
New Revision: 6815

Modified:
   code/branches/rocket/src/modules/weapons/RocketController.cc
   code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc
Log:
trying to destroy RocketController within SimpleRocket destroyer but doesn't work...

Modified: code/branches/rocket/src/modules/weapons/RocketController.cc
===================================================================
--- code/branches/rocket/src/modules/weapons/RocketController.cc	2010-05-01 16:15:40 UTC (rev 6814)
+++ code/branches/rocket/src/modules/weapons/RocketController.cc	2010-05-02 11:39:33 UTC (rev 6815)
@@ -30,6 +30,7 @@
 #include "projectiles/SimpleRocket.h" 
 #include "util/Math.h"
 #include "weapons/projectiles/SimpleRocket.h"
+#include "util/Debug.h"
 
 
 namespace orxonox
@@ -40,6 +41,7 @@
     */
     RocketController::RocketController(BaseObject* creator) : Controller(creator)
     {
+		COUT(0)<< "RocketController constructed\n";
 
         RegisterObject(RocketController);
 		SimpleRocket* rocket = new SimpleRocket(this);
@@ -68,9 +70,9 @@
 
 
 	RocketController::~RocketController() {
+		COUT(0)<< "RocketController destroyed\n";
+		delete this;
 
-		delete this->getControllableEntity();
-
 	}
 
 

Modified: code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc	2010-05-01 16:15:40 UTC (rev 6814)
+++ code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc	2010-05-02 11:39:33 UTC (rev 6815)
@@ -40,6 +40,7 @@
 #include "controllers/Controller.h"
 #include "weapons/RocketController.h"
 #include "sound/WorldSound.h"
+#include "util/Debug.h"
 
 namespace orxonox
 {
@@ -57,6 +58,7 @@
         this->localAngularVelocity_ = 0;
         this->bDestroy_ = false;
         this->lifetime_ = 100;
+		COUT(0)<< "simplerocket constructed\n";
 		//this->camera_ = null;
 		//RocketController* myRController = new RocketController(this);
 		//this->setController(creator);
@@ -101,6 +103,8 @@
     */
     SimpleRocket::~SimpleRocket()
     {
+		COUT(0)<< "simplerocket destroyed\n";
+		delete this->getController();
     }
 
     /**