Changeset 5162 in orxonox.OLD

Timestamp:

Sep 5, 2005, 10:29:03 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more elaborate and MUCH easier through Macro-definition

Location:

trunk/src

Files:

• lib/shell/shell.cc (modified) (2 diffs)
• lib/shell/shell_command.h (modified) (1 diff)
• util/loading/factory.cc (modified) (2 diffs)
• util/loading/game_loader.cc (modified) (2 diffs)
• world_entities/player.cc (modified) (1 diff)

trunk/src/lib/shell/shell.cc

@@ -32 +32 @@
 using namespace std;
 
-ShellCommandBase* tmp = ShellCommand<Shell>::registerCommand("clear", "Shell", &Shell::clear);
+SHELL_COMMAND(clear, Shell, clear);
 
 /**
@@ -76 +76 @@
   for (int i = 1; i < SDLK_LAST; i++)
     evh->subscribe(this, ES_SHELL, i);
-
-  //void ShellCommand<T>::registerCommand(const char* commandName, ClassID classID, T* object, void* functionPointer, unsigned int paramCount, ...)
-
-
-/*  ShellCommand<Shell>::registerCommand("testS", CL_SHELL, &Shell::testS);
-  ShellCommand<Shell>::registerCommand("testI", CL_SHELL, &Shell::testI, 5);
-  ShellCommand<Shell>::registerCommand("testB", CL_SHELL, &Shell::testB);
-  ShellCommand<Shell>::registerCommand("testF", CL_SHELL, &Shell::testF);
-  ShellCommand<Shell>::registerCommand("testSF", CL_SHELL, &Shell::testSF);*/
 }
 

trunk/src/lib/shell/shell_command.h

@@ -21 +21 @@
 // FORWARD DECLARATION
 template<class T> class tList;
+
+#define SHELL_COMMAND(command, class, function) \
+        ShellCommand<class>* shell_command_##class##_##command = ShellCommand<class>::registerCommand(#command, #class, &class::function)
 
 

trunk/src/util/loading/factory.cc

@@ -20 +20 @@
 #include "game_loader.h"
 using namespace std;
+
+SHELL_COMMAND(create, Factory, fabricate);
+
 
 /*  --------------------------------------------------
@@ -71 +74 @@
   {
     Factory::first = factory;
-    ShellCommand<Factory>::registerCommand("create", "Factory", &Factory::fabricate);
   }
   else

trunk/src/util/loading/game_loader.cc

@@ -34 +34 @@
 
 
-GameLoader* GameLoader::singletonRef = 0;
+SHELL_COMMAND(quit, GameLoader, stop);
+
+
+GameLoader* GameLoader::singletonRef = NULL;
+
 
 /**
@@ -44 +48 @@
   this->setName("GameLoader");
 
-  ShellCommand<GameLoader>::registerCommand("quit", "GameLoader", &GameLoader::stop);
 }
 

trunk/src/world_entities/player.cc

@@ -114 +114 @@
   this->weaponMan->addWeapon(turret4, 2, 5);
 
-
-//  ShellCommand<Player>::registerCommand("init", CL_PLAYER, &Player::init);
   //this->weaponMan->addWeapon(turret, 3, 0);