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

Timestamp:

Aug 1, 2011, 4:37:38 PM (13 years ago)

Author:

landauf

Message:

Replaced COUT() with orxout() in tools and orxonox library. Requires quite some fine-tuning.

Location:

code/branches/output/src/orxonox/gamestates

Files:

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

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

@@ -155 +155 @@
 
         // call the loader
-        COUT(0) << "Loading level..." << std::endl;
+        orxout(user_status) << "Loading level..." << endl;
         startFile_ = new XMLFile(LevelManager::getInstance().getDefaultLevel());
         bool loaded = Loader::open(startFile_);
@@ -169 +169 @@
         delete startFile_;
 
-        COUT(3) << "Unloaded level. Remaining objects:" << std::endl;
+        orxout(user_status) << "Unloaded level" << endl;
+        orxout(internal_info) << "Remaining objects:" << endl;
         unsigned int i = 0;
         for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it != ObjectList<BaseObject>::end(); ++it)
@@ -176 +177 @@
             if (find == this->staticObjects_.end())
             {
-                COUT(3) << ++i << ": " << it->getIdentifier()->getName() << " (" << *it << "), references: " << it->getReferenceCount() << std::endl;
+                orxout(internal_info) << ++i << ": " << it->getIdentifier()->getName() << " (" << *it << "), references: " << it->getReferenceCount() << endl;
             }
         }
-        COUT(3) << i << " objects remaining.";
+        orxout(internal_info) << i << " objects remaining.";
         if (i == 0)
-            COUT(3) << " Well done!" << std::endl;
+            orxout(internal_info) << " Well done!" << endl;
         else
-            COUT(3) << " Try harder!" << std::endl;
+            orxout(internal_info) << " Try harder!" << endl;
     }
 

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

@@ -54 +54 @@
 
     this->mserver = new MasterServer();
-    COUT(0) << "Loading masterserver mode" << std::endl;
+    orxout(user_status) << "Loading masterserver mode" << endl;
 
     this->mserver->run();

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

@@ -77 +77 @@
         {
             if (dynamic_cast<Synchronisable*>(*it))
-                COUT(0) << "object: " << it->getIdentifier()->getName() << " id: " << dynamic_cast<Synchronisable*>(*it)->getObjectID() << std::endl;
+                orxout(debug_output) << "object: " << it->getIdentifier()->getName() << " id: " << dynamic_cast<Synchronisable*>(*it)->getObjectID() << endl;
             else
-                COUT(0) << "object: " << it->getIdentifier()->getName() << std::endl;
+                orxout(debug_output) << "object: " << it->getIdentifier()->getName() << endl;
             nr++;
         }
-        COUT(0) << "currently got " << nr << " objects" << std::endl;
+        orxout(debug_output) << "currently got " << nr << " objects" << endl;
     }
 

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

@@ -57 +57 @@
 
         this->server_ = new Server(CommandLineParser::getValue("port"));
-        COUT(0) << "Loading scene in server mode" << std::endl;
+        orxout(user_status) << "Loading scene in server mode" << endl;
 
         server_->open();