Changeset 7284 for code/trunk/src/orxonox/gametypes/Dynamicmatch.cc

Timestamp:

Aug 31, 2010, 3:37:40 AM (14 years ago)

Author:

landauf

Message:

merged consolecommands3 branch back to trunk.

note: the console command interface has changed completely, but the documentation is not yet up to date. just copy an existing command and change it to your needs, it's pretty self-explanatory. also the include files related to console commands are now located in core/command/. in the game it should work exactly like before, except for some changes in the auto-completion.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gametypes/Dynamicmatch.cc (modified) (2 diffs)

code/trunk/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);
                 }