Changeset 6863 for code/branches/rocket/src/modules/weapons/projectiles

Timestamp:

May 7, 2010, 4:14:18 PM (15 years ago)

Author:

gnadler

Message:

orxonox crashes while, respectively after destroying either the Rocket or the Controller.

Location:

code/branches/rocket/src/modules/weapons/projectiles

Files:

• SimpleRocket.cc (modified) (2 diffs)
• SimpleRocket.h (modified) (2 diffs)

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

@@ -98 +98 @@
     {
                 if (this->isInitialized()) {
+                        this->getController()->destroy();
                 COUT(0)<< "simplerocket destroyed\n";
-                delete this->getController();
                 }
         }
@@ -158 +158 @@
             if (victim)
                 victim->hit(this->owner_, contactPoint, dmg);
-//             this->destroy();
+             this->destroy();
         }
         return false;

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

@@ -112 +112 @@
                 { return this->damage_; }
             virtual void fired(unsigned int firemode);
+                        
 
         private:
@@ -118 +119 @@
             float damage_;
             bool bDestroy_;
+
 
             WeakPtr<PlayerInfo> player_;