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

[gnadler at orxonox.net]

Author: gnadler
Date: 2010-05-02 21:55:23 +0200 (Sun, 02 May 2010)
New Revision: 6817

Modified:
   code/branches/rocket/src/modules/weapons/RocketController.cc
   code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc
Log:
made a mistake in previous update, but still not working...

Modified: code/branches/rocket/src/modules/weapons/RocketController.cc
===================================================================
--- code/branches/rocket/src/modules/weapons/RocketController.cc	2010-05-02 19:50:06 UTC (rev 6816)
+++ code/branches/rocket/src/modules/weapons/RocketController.cc	2010-05-02 19:55:23 UTC (rev 6817)
@@ -71,8 +71,6 @@
 
 	RocketController::~RocketController() {
 		COUT(0)<< "RocketController destroyed\n";
-		delete this;
-
 	}
 
 

Modified: code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc	2010-05-02 19:50:06 UTC (rev 6816)
+++ code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc	2010-05-02 19:55:23 UTC (rev 6817)
@@ -58,7 +58,6 @@
         this->localAngularVelocity_ = 0;
         this->bDestroy_ = false;
         this->lifetime_ = 100;
-		this->controller_=null;
 		COUT(0)<< "simplerocket constructed\n";
 		//this->camera_ = null;
 		//RocketController* myRController = new RocketController(this);
@@ -105,8 +104,8 @@
     SimpleRocket::~SimpleRocket()
     {
 		COUT(0)<< "simplerocket destroyed\n";
-		if (this->controller_) delete this->controller_;
-    }
+		if (this->hasLocalController()) delete this->getController();
+	}
 
     /**
     @brief