Changeset 7374 in orxonox.OLD for trunk/src/orxonox.cc

Timestamp:

Apr 26, 2006, 3:28:55 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: added new Files shell_completion_plugin for the new Plugin Structure.
Also created the first namespace: OrxShell

File:

• trunk/src/orxonox.cc (modified) (9 diffs)

trunk/src/orxonox.cc

@@ -116 +116 @@
   Factory::deleteFactories();
   FastFactory::deleteAll();
-  ShellCommandClass::unregisterAllCommands();
+  OrxShell::ShellCommandClass::unregisterAllCommands();
 
   LoadClassDescription::deleteAllDescriptions();
@@ -129 +129 @@
   delete ResourceManager::getInstance(); // deletes the Resource Manager
   // output-buffer
-  delete ShellBuffer::getInstance();
+  delete OrxShell::ShellBuffer::getInstance();
 
   SDL_QuitSubSystem(SDL_INIT_TIMER);
@@ -353 +353 @@
 int Orxonox::initMisc()
 {
-  ShellBuffer::getInstance();
+  OrxShell::ShellBuffer::getInstance();
   return 0;
 }
@@ -417 +417 @@
 {
   CmdLinePrefsReader prefs;
-  
+
   IniFilePrefsReader ini(ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE));
-  
+
   prefs.parse(argc, argv);
-  
+
   if ( Preferences::getInstance()->getString("misc", "showLicenseAndExit", "") == "1" )
   {
@@ -427 +427 @@
     return 0;
   }
-  
+
   if( Preferences::getInstance()->getString("game", "showGui", "") == "1" )
     showGui = true;
@@ -433 +433 @@
            Preferences::getInstance()->getString( "game", "gameType", "" ) == "multiplayer_client" )
     return startNetworkOrxonox(argc, argv);
-  
+
   return startOrxonox(argc, argv, "", -1);
   return 0;
@@ -449 +449 @@
 
   std::string gameType = Preferences::getInstance()->getString( "game", "gameType", "" );
-  
+
   if ( gameType == "multiplayer_client" )
   {
     int port = Preferences::getInstance()->getInt( "game", "port", DEFAULT_ORXONOX_PORT );
     std::string host = Preferences::getInstance()->getString( "game", "host", "" );
-    
+
     if ( host == "" )
     {
@@ -460 +460 @@
       return 1;
     }
-    
+
     printf("Starting Orxonox as client: connecting to %s, on port %i\n", host.c_str(), port);
-    
+
     startOrxonox(argc, argv, host.c_str(), port);
   }
@@ -468 +468 @@
   {
     int port = Preferences::getInstance()->getInt( "game", "port", DEFAULT_ORXONOX_PORT );
-    
+
     printf("Starting Orxonox as server: listening on port %i\n", port);
-    
+
     startOrxonox(argc, argv, "", port);
   }