Changeset 6817

Timestamp:

May 2, 2010, 9:55:23 PM (14 years ago)

Author:

gnadler

Message:

made a mistake in previous update, but still not working…

Location:

code/branches/rocket/src/modules/weapons

Files:

• RocketController.cc (modified) (1 diff)
• projectiles/SimpleRocket.cc (modified) (2 diffs)

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

@@ -72 +72 @@
         RocketController::~RocketController() {
                 COUT(0)<< "RocketController destroyed\n";
-                delete this;
-
         }
 

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

@@ -59 +59 @@
         this->bDestroy_ = false;
         this->lifetime_ = 100;
-                this->controller_=null;
                 COUT(0)<< "simplerocket constructed\n";
                 //this->camera_ = null;
@@ -106 +105 @@
     {
                 COUT(0)<< "simplerocket destroyed\n";
-                if (this->controller_) delete this->controller_;
-    }
+                if (this->hasLocalController()) delete this->getController();
+        }
 
     /**