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

Timestamp:

Aug 7, 2011, 10:51:54 PM (13 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/gamestates

Files:

• GSClient.cc (modified) (1 diff)
• GSLevel.cc (modified) (3 diffs)
• GSMainMenu.cc (modified) (1 diff)
• GSMasterServer.cc (modified) (1 diff)
• GSServer.cc (modified) (1 diff)

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);