Changeset 7200 for code/branches/consolecommands3/src/orxonox

Timestamp:

Aug 22, 2010, 12:27:53 AM (14 years ago)

Author:

landauf

Message:

createExecutor() now returns a SharedPtr instead of a pointer. Adapted code that uses createExecutor() accordingly.

Location:

code/branches/consolecommands3/src/orxonox

Files:

• gametypes/Dynamicmatch.cc (modified) (2 diffs)
• weaponsystem/Munition.cc (modified) (1 diff)

code/branches/consolecommands3/src/orxonox/gametypes/Dynamicmatch.cc

@@ -155 +155 @@
                     spaceship->getEngine()->setSpeedFactor(5);
                     WeakPtr<Engine>* ptr = new WeakPtr<Engine>(spaceship->getEngine());
-                    new Timer(10, false, &createExecutor(createFunctor(&Dynamicmatch::resetSpeedFactor, this))->setDefaultValue(0, ptr), true);
+                    ExecutorPtr executor = createExecutor(createFunctor(&Dynamicmatch::resetSpeedFactor, this));
+                    executor->setDefaultValue(0, ptr);
+                    new Timer(10, false, executor, true);
                 }
             }
@@ -254 +256 @@
                     spaceship->getEngine()->setSpeedFactor(5);
                     WeakPtr<Engine>* ptr = new WeakPtr<Engine>(spaceship->getEngine());
-                    new Timer(10, false, &createExecutor(createFunctor(&Dynamicmatch::resetSpeedFactor, this))->setDefaultValue(0, ptr), true);
+                    ExecutorPtr executor = createExecutor(createFunctor(&Dynamicmatch::resetSpeedFactor, this));
+                    executor->setDefaultValue(0, ptr);
+                    new Timer(10, false, executor, true);
                 }
 

code/branches/consolecommands3/src/orxonox/weaponsystem/Munition.cc

@@ -461 +461 @@
         if (bUseReloadTime && (munition->reloadTime_ > 0 || munition->bStackMunition_))
         {
-            Executor* executor = createExecutor(createFunctor(&Magazine::loaded, this));
+            const ExecutorPtr& executor = createExecutor(createFunctor(&Magazine::loaded, this));
             executor->setDefaultValues(munition);