Changeset 7284 for code/trunk/src/orxonox/controllers/ArtificialController.cc

Timestamp:

Aug 31, 2010, 3:37:40 AM (15 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/controllers/ArtificialController.cc (modified) (2 diffs)

code/trunk/src/orxonox/controllers/ArtificialController.cc

@@ -33 +33 @@
 
 #include "util/Math.h"
-#include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "core/command/ConsoleCommand.h"
 #include "worldentities/ControllableEntity.h"
 #include "worldentities/pawns/Pawn.h"
@@ -47 +47 @@
 namespace orxonox
 {
-    SetConsoleCommand(ArtificialController, formationflight, true);
-    SetConsoleCommand(ArtificialController, masteraction, true);
-    SetConsoleCommand(ArtificialController, followme, true);
-    SetConsoleCommand(ArtificialController, passivebehaviour, true);
-    SetConsoleCommand(ArtificialController, formationsize, true);
+    SetConsoleCommand("ArtificialController", "formationflight",  &ArtificialController::formationflight);
+    SetConsoleCommand("ArtificialController", "masteraction",     &ArtificialController::masteraction);
+    SetConsoleCommand("ArtificialController", "followme",         &ArtificialController::followme);
+    SetConsoleCommand("ArtificialController", "passivebehaviour", &ArtificialController::passivebehaviour);
+    SetConsoleCommand("ArtificialController", "formationsize",    &ArtificialController::formationsize);
 
     static const unsigned int STANDARD_MAX_FORMATION_SIZE = 7;