Changeset 5791 for code/branches/core5/src/orxonox/worldentities

Timestamp:

Sep 26, 2009, 2:05:30 AM (15 years ago)

Author:

landauf

Message:

Added destroy() function to OrxonoxClass.
Removed destroy() functions from some subclasses.
Expanded Timer to accept Functors of other classes too.

Location:

code/branches/core5/src/orxonox/worldentities

Files:

• BigExplosion.cc (modified) (1 diff)
• BigExplosion.h (modified) (2 diffs)
• ExplosionChunk.cc (modified) (1 diff)
• ExplosionChunk.h (modified) (1 diff)

code/branches/core5/src/orxonox/worldentities/BigExplosion.cc

@@ -333 +333 @@
     }
 
-    void BigExplosion::destroy()
-    {
-        delete this;
-    }
-
 /* TODO
 

code/branches/core5/src/orxonox/worldentities/BigExplosion.h

@@ -57 +57 @@
             void checkStop();
             void stop();
-            void destroy();
             void init();
             void initZero();
@@ -98 +97 @@
             ParticleInterface*    explosionFire_;
 
-            LODParticle::Value      LOD_;
-            Timer<BigExplosion> destroyTimer_;
+            LODParticle::Value    LOD_;
+            Timer<BigExplosion>   destroyTimer_;
     };
 }

code/branches/core5/src/orxonox/worldentities/ExplosionChunk.cc

@@ -136 +136 @@
     }
 
-    void ExplosionChunk::destroy()
-    {
-        delete this;
-    }
-
     void ExplosionChunk::tick(float dt)
     {

code/branches/core5/src/orxonox/worldentities/ExplosionChunk.h

@@ -55 +55 @@
             void checkStop();
             void stop();
-            void destroy();
 
             bool                  bStop_;
             ParticleInterface*    fire_;
             ParticleInterface*    smoke_;
-            LODParticle::Value      LOD_;
+            LODParticle::Value    LOD_;
             Timer<ExplosionChunk> destroyTimer_;
     };