Changeset 5791 for code/branches/core5/src/modules

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/modules/weapons

Files:

• MuzzleFlash.cc (modified) (1 diff)
• MuzzleFlash.h (modified) (1 diff)

code/branches/core5/src/modules/weapons/MuzzleFlash.cc

@@ -41 +41 @@
         RegisterObject(MuzzleFlash);
         this->setScale(0.1f);
-        
+
         this->delayTimer_.setTimer(0.1f, false, this, createExecutor(createFunctor(&MuzzleFlash::destroy)));
-
     }
-
-    void MuzzleFlash::destroy()
-    {
-        delete this;
-    }
- 
 }

code/branches/core5/src/modules/weapons/MuzzleFlash.h

@@ -43 +43 @@
             virtual ~MuzzleFlash() {}
 
-
-
         private:
-            void destroy();
             Timer<MuzzleFlash> delayTimer_;
-
     };
 }