Changeset 9667 for code/trunk/src/orxonox/worldentities/ExplosionChunk.cc

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/ExplosionChunk.cc (modified) (2 diffs)

code/trunk/src/orxonox/worldentities/ExplosionChunk.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateFactory(ExplosionChunk);
+    RegisterClass(ExplosionChunk);
 
-    ExplosionChunk::ExplosionChunk(BaseObject* creator) : MovableEntity(creator)
+    ExplosionChunk::ExplosionChunk(Context* context) : MovableEntity(context)
     {
         RegisterObject(ExplosionChunk);
@@ -92 +92 @@
             {
                 this->detachOgreObject(this->fire_->getParticleSystem());
-                this->fire_->destroy();
+                delete this->fire_;
             }
             if (this->smoke_)
             {
                 this->detachOgreObject(this->smoke_->getParticleSystem());
-                this->smoke_->destroy();
+                delete this->smoke_;
             }
         }