Changeset 8998 for code/branches/presentation2011/src/orxonox/infos

Timestamp:

Dec 18, 2011, 2:35:02 PM (13 years ago)

Author:

jo

Message:

Merged SpaceraceTwo. Old racelevel does not work anymore.

Location:

code/branches/presentation2011

Files:

• . (modified) (1 prop)
• src/orxonox/infos/GametypeInfo.cc (modified) (2 diffs)
• src/orxonox/infos/PlayerInfo.cc (modified) (1 diff)

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

@@ -71 +71 @@
         this->bStarted_ = false;
         this->bEnded_ = false;
-        this->startCountdown_ = 0.0f;
+        this->startCountdown_ = 10.0f;
         this->bStartCountdownRunning_ = false;
-        this->counter_ = 0;
+        this->counter_ = 10;
         this->spawned_ = false;
         this->readyToSpawn_ = false;
@@ -164 +164 @@
     {
         if(this->bStarted_)
-            return;
+           { return;}
         
         this->bStarted_ = true;
         this->changedStarted();
+        
+       
     }
 

code/branches/presentation2011/src/orxonox/infos/PlayerInfo.cc

@@ -58 +58 @@
 
         this->registerVariables();
+        
     }