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

Timestamp:

Oct 19, 2011, 4:21:48 PM (13 years ago)

Author:

eceline

Message:

Space Race mit countdown

Location:

code/branches/spaceraceTwo/src/orxonox

Files:

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

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

@@ -123 +123 @@
         if (this->gtinfo_->isStartCountdownRunning() && !this->gtinfo_->hasStarted())
             this->gtinfo_->countdownStartCountdown(dt);
-
+                        
         if (!this->gtinfo_->hasStarted())
         {
@@ -129 +129 @@
             {
                 // Inform the GametypeInfo that the player is ready to spawn.
-                if(it->first->isHumanPlayer() && it->first->isReadyToSpawn())
+                if(it->first->isHumanPlayer() && it->first->isReadyToSpawn()){
                     this->gtinfo_->playerReadyToSpawn(it->first);
-            }
-                    
-            this->checkStart();
+                   
+                }
+            }
+                 
+                this->checkStart();
         }
         else if (!this->gtinfo_->hasEnded())
-            this->spawnDeadPlayersIfRequested();
-
-        this->assignDefaultPawnsIfNeeded();
+           { this->spawnDeadPlayersIfRequested();
+
+        this->assignDefaultPawnsIfNeeded();}
     }
 

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

@@ -156 +156 @@
             virtual void resetTimer(float t);
 
+        
+
         protected:
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;

code/branches/spaceraceTwo/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;