[Orxonox-commit 2100] r6816 - code/branches/rocket/src/modules/weapons/projectiles

[gnadler at orxonox.net]

Author: gnadler
Date: 2010-05-02 21:50:06 +0200 (Sun, 02 May 2010)
New Revision: 6816

Modified:
   code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc
Log:
updated ~SimpleRocket but still doesn't work

Modified: code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc	2010-05-02 11:39:33 UTC (rev 6815)
+++ code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc	2010-05-02 19:50:06 UTC (rev 6816)
@@ -58,6 +58,7 @@
         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);
@@ -104,7 +105,7 @@
     SimpleRocket::~SimpleRocket()
     {
 		COUT(0)<< "simplerocket destroyed\n";
-		delete this->getController();
+		if (this->controller_) delete this->controller_;
     }
 
     /**