Changeset 8830 for code/branches/output/src/orxonox

Timestamp:

Aug 7, 2011, 10:51:54 PM (14 years ago)

Author:

landauf

Message:

added some output (user and internal) throughout the initialization of the game, graphics, and game states

Location:

code/branches/output/src/orxonox

Files:

• Main.cc (modified) (2 diffs)
• gamestates/GSClient.cc (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (3 diffs)
• gamestates/GSMainMenu.cc (modified) (1 diff)
• gamestates/GSMasterServer.cc (modified) (1 diff)
• gamestates/GSServer.cc (modified) (1 diff)
• sound/SoundManager.cc (modified) (1 diff)

code/branches/output/src/orxonox/Main.cc

@@ -61 +61 @@
     int main(const std::string& strCmdLine)
     {
+        orxout(internal_status) << "entering orxonox::main()" << endl;
+        orxout(internal_info) << "command line: " << strCmdLine << endl;
+
+        orxout(internal_info) << "creating Game object:" << endl;
         Game* game = new Game(strCmdLine);
+        orxout(user_status) << "Finished initialization" << endl;
 
         if (CommandLineParser::getValue("generateDoc").getString().empty())
         {
+            orxout(internal_info) << "preparing game states" << endl;
+
             /* TODO make this clear */
             game->setStateHierarchy(
@@ -98 +105 @@
             }
 
+            orxout(internal_info) << "starting game" << endl;
             game->run();
         }

code/branches/output/src/orxonox/gamestates/GSClient.cc

@@ -52 +52 @@
     void GSClient::activate()
     {
+        orxout(user_status) << "Starting client" << endl;
+
         GameMode::setIsClient(true);
 

code/branches/output/src/orxonox/gamestates/GSLevel.cc

@@ -74 +74 @@
     void GSLevel::activate()
     {
+        orxout(user_status) << "Loading level" << endl;
+
         if (GameMode::showsGraphics())
         {
@@ -155 +157 @@
 
         // call the loader
-        orxout(user_status) << "Loading level..." << endl;
         startFile_ = new XMLFile(LevelManager::getInstance().getDefaultLevel());
         bool loaded = Loader::open(startFile_);
@@ -169 +170 @@
         delete startFile_;
 
-        orxout(user_status) << "Unloaded level" << endl;
         orxout(internal_info) << "Remaining objects:" << endl;
         unsigned int i = 0;

code/branches/output/src/orxonox/gamestates/GSMainMenu.cc

@@ -95 +95 @@
     void GSMainMenu::activate()
     {
+        orxout(user_status) << "Loading main menu" << endl;
+
         // show main menu
         GraphicsManager::getInstance().setCamera(this->camera_);

code/branches/output/src/orxonox/gamestates/GSMasterServer.cc

@@ -50 +50 @@
   void GSMasterServer::activate()
   {
+    orxout(user_status) << "Starting masterserver" << endl;
+
     /* TODO make this work for masterserver as well */
     //GameMode::setIsServer(true);
 
     this->mserver = new MasterServer();
-    orxout(user_status) << "Loading masterserver mode" << endl;
-
     this->mserver->run();
   }

code/branches/output/src/orxonox/gamestates/GSServer.cc

@@ -54 +54 @@
     void GSServer::activate()
     {
+        orxout(user_status) << "Starting server" << endl;
+
         GameMode::setIsServer(true);
 

code/branches/output/src/orxonox/sound/SoundManager.cc

@@ -71 +71 @@
         RegisterRootObject(SoundManager);
 
+        orxout(user_status) << "Loading sound" << endl;
+
         this->bDestructorCalled_ = false;