Changeset 7284 for code/trunk/src/orxonox/gametypes

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)
• src/orxonox/gametypes/Gametype.cc (modified) (3 diffs)
• src/orxonox/gametypes/Gametype.h (modified) (1 diff)
• src/orxonox/gametypes/TeamBaseMatch.cc (modified) (1 diff)

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);
                 }
 

code/trunk/src/orxonox/gametypes/Gametype.cc

@@ -33 +33 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/GameMode.h"
-#include "core/ConsoleCommand.h"
+#include "core/command/ConsoleCommand.h"
 
 #include "infos/PlayerInfo.h"
@@ -79 +79 @@
         else
             this->scoreboard_ = 0;
-
-        /* HACK HACK HACK */
-        this->hackAddBots_ = createConsoleCommand( createFunctor(&Gametype::addBots, this), "hackAddBots");
-        this->hackKillBots_ = createConsoleCommand( createFunctor(&Gametype::killBots, this), "hackKillBots");
-        CommandExecutor::addConsoleCommandShortcut( this->hackAddBots_ );
-        CommandExecutor::addConsoleCommandShortcut( this->hackKillBots_ );
-        /* HACK HACK HACK */
     }
 
@@ -93 +86 @@
         {
             this->gtinfo_->destroy();
-            if( this->hackAddBots_ )
-                delete this->hackAddBots_;
-            if( this->hackKillBots_ )
-                delete this->hackKillBots_;
         }
     }

code/trunk/src/orxonox/gametypes/Gametype.h

@@ -184 +184 @@
             // Config Values
             std::string scoreboardTemplate_;
-
-            /* HACK HACK HACK */
-            ConsoleCommand* hackAddBots_;
-            ConsoleCommand* hackKillBots_;
-            /* HACK HACK HACK */
     };
 }

code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/Executor.h"
+#include "core/command/Executor.h"
 #include "worldentities/pawns/TeamBaseMatchBase.h"
 #include "infos/PlayerInfo.h"