Changeset 5831 for code/branches/core5/src/orxonox/worldentities/BigExplosion.cc

Timestamp:

Sep 28, 2009, 10:48:47 PM (15 years ago)

Author:

landauf

Message:

Realized Timer doesn't have to be a template, hence merged TimerBase, Timer and StaticTimer.
Removed the object pointer from Timer for memberfunctions, use createFunctor(f, object) instead.

File:

• code/branches/core5/src/orxonox/worldentities/BigExplosion.cc (modified) (2 diffs)

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

@@ -90 +90 @@
             this->setVelocity(velocity);
 
-            this->destroyTimer_.setTimer(rnd(2, 4), false, this, createExecutor(createFunctor(&BigExplosion::stop)));
+            this->destroyTimer_.setTimer(rnd(2, 4), false, createExecutor(createFunctor(&BigExplosion::stop, this)));
         }
         this->registerVariables();
@@ -329 +329 @@
         {
             this->bStop_ = true;
-            this->destroyTimer_.setTimer(1.0f, false, this, createExecutor(createFunctor(&BigExplosion::destroy)));
+            this->destroyTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&BigExplosion::destroy, this)));
         }
     }