Changeset 5139 in orxonox.OLD for trunk/src

Timestamp:

Aug 26, 2005, 1:54:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: registered 'quit' from GameLoader

Location:

trunk/src/util

Files:

• loading/game_loader.cc (modified) (4 diffs)
• loading/game_loader.h (modified) (1 diff)
• shell_command.h (modified) (1 diff)

trunk/src/util/loading/game_loader.cc

@@ -17 +17 @@
 
 #include "game_loader.h"
+
+#include "shell_command.h"
 #include "campaign.h"
 #include "world.h"
@@ -26 +28 @@
 #include "event.h"
 #include "event_handler.h"
-
 #include <string.h>
 
@@ -42 +43 @@
   this->setClassID(CL_GAME_LOADER, "GameLoader");
   this->setName("GameLoader");
+
+  ShellCommand<GameLoader>::registerCommand("quit", CL_GAME_LOADER, &GameLoader::stop);
 }
 
@@ -165 +168 @@
     hehehe, have ya seen it... :)
 */
-ErrorMessage GameLoader::stop()
+void GameLoader::stop()
 {
   if(this->currentCampaign != NULL)

trunk/src/util/loading/game_loader.h

@@ -47 +47 @@
   ErrorMessage loadCampaign(const char* name);
   ErrorMessage start();
-  ErrorMessage stop();
+  void stop();
   ErrorMessage pause();
   ErrorMessage resume();

trunk/src/util/shell_command.h

@@ -18 +18 @@
 // FORWARD DECLARATION
 template<class T> class tList;
-template<class T> class tIterator;