Changeset 8949 for code/branches/spaceraceTwo/src/orxonox

Timestamp:

Nov 23, 2011, 4:16:15 PM (13 years ago)

Author:

eceline

Message:

level Spacerace2 works now

Location:

code/branches/spaceraceTwo/src/orxonox

Files:

• gametypes/Gametype.cc (modified) (6 diffs)
• infos/GametypeInfo.cc (modified) (1 diff)

code/branches/spaceraceTwo/src/orxonox/gametypes/Gametype.cc

@@ -134 +134 @@
                 
             }
-            
-             const std::string& message = "Gametype should start";
-         orxout()<< message << endl;    
-                this->start();
-                const std::string& message2 = "Gametype should have started";
-         orxout()<< message2 << endl;
+              
+                this->checkStart();
+           
          
         }
@@ -149 +146 @@
 
     void Gametype::start()
-    { const std::string& message = "Gametype starts";
-         orxout()<< message << endl;
+    {
          
         this->addBots(this->numberOfBots_);
@@ -158 +154 @@
         this->spawnPlayersIfRequested();
         
-         
+        
     }
 
@@ -387 +383 @@
                 {
                     this->gtinfo_->stopStartCountdown();
-                    this->gtinfo_->setStartCountdown(0.0f);;
+                    this->gtinfo_->setStartCountdown(0.0f);
                     this->start();
                 }
@@ -408 +404 @@
                             hashumanplayers = true;
                     }
+                         
                     if (allplayersready && hashumanplayers)
                     {
@@ -419 +416 @@
                 }
             }
+            
         }
     }

code/branches/spaceraceTwo/src/orxonox/infos/GametypeInfo.cc

@@ -164 +164 @@
     {
         if(this->bStarted_)
-           {const std::string& message = "bStarted true";
-         orxout()<< message << endl; return;}
+           { return;}
         
         this->bStarted_ = true;
         this->changedStarted();
         
-        const std::string& message = "bStarted true";
-         orxout()<< message << endl;
+       
     }