Changeset 8944 for code/branches/spaceraceTwo

Timestamp:

Nov 23, 2011, 2:14:29 PM (13 years ago)

Author:

eceline

Message:

level file added

Location:

code/branches/spaceraceTwo

Files:

• data/levels/Spacerace2.oxw (added)
• src/modules/gametypes/SpaceRace.cc (modified) (3 diffs)
• src/modules/gametypes/SpaceRaceManager.cc (modified) (1 diff)
• src/orxonox/gametypes/Gametype.cc (modified) (3 diffs)
• src/orxonox/infos/GametypeInfo.cc (modified) (1 diff)

code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc

@@ -46 +46 @@
         RegisterObject(SpaceRace);
         
+         const std::string& message = "SpaceRace constructed";
+         orxout()<< message << endl;
+    
         this->bTimeIsUp_ = false;
         this->numberOfBots_ = 0;
@@ -52 +55 @@
        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
         {this->checkpointReached_[it->first]=0;}
+        
+        
     }
     
@@ -92 +97 @@
 
     void SpaceRace::start()
-    {
-                           this->spawnPlayersIfRequested(); Gametype::checkStart(); 
+    { 
+                Gametype::start();
+                           this->spawnPlayersIfRequested(); //Gametype::checkStart(); 
                            this->cantMove_=true; 
          

code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc

@@ -45 +45 @@
     {
         RegisterObject(SpaceRaceManager);
-                
+         
+          const std::string& message = "SpaceRaceManager constructed";
+         orxout()<< message << endl;      
     }
 

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

@@ -134 +134 @@
                 
             }
-                 
-                this->checkStart();
+            
+             const std::string& message = "Gametype should start";
+         orxout()<< message << endl;    
+                this->start();
+                const std::string& message2 = "Gametype should have started";
+         orxout()<< message2 << endl;
+         
         }
         else if (!this->gtinfo_->hasEnded())
@@ -144 +149 @@
 
     void Gametype::start()
-    {
+    { const std::string& message = "Gametype starts";
+         orxout()<< message << endl;
+         
         this->addBots(this->numberOfBots_);
 
@@ -150 +157 @@
 
         this->spawnPlayersIfRequested();
+        
+         
     }
 

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

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