Changeset 8911

Timestamp:

Nov 2, 2011, 1:23:26 PM (12 years ago)

Author:

eceline

Message:

countdown

Location:

code/branches/spaceraceTwo/src/modules/gametypes

Files:

• CMakeLists.txt (modified) (1 diff)
• SpaceRace.cc (modified) (3 diffs)
• SpaceRace.h (modified) (2 diffs)
• SpaceRaceManager.cc (added)
• SpaceRaceManager.h (added)

code/branches/spaceraceTwo/src/modules/gametypes/CMakeLists.txt

@@ -2 +2 @@
   SpaceRace.cc
   RaceCheckPoint.cc
+  SpaceRaceManager.cc
 )
 

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

@@ -29 +29 @@
 #include "SpaceRace.h"
 
+#include "items/Engine.h"
+
 #include "core/CoreIncludes.h"
 #include "chat/ChatManager.h"
@@ -46 +48 @@
         this->bTimeIsUp_ = false;
         this->numberOfBots_ = 0;
-        
+        this->cantMove_=false;
     }
     
@@ -88 +90 @@
 
     void SpaceRace::start()
-    {   int i=0;
-        for(ObjectList<Engine>::iterator it = ObjectList<Engine>::begin(); it; ++it)
-        {this->maxSpeedBack_[i]=it->getMaxSpeedBack();
-        this->maxSpeedFront_[i]=it->getMaxSpeedFront();
-        this->maxSpeedLeftRight_[i]=it->getMaxSpeedLeftRight();
-        this->maxSpeedUpDown_[i]=(it->getMaxSpeedUpDown());
-        
-        it->setMaxSpeedBack(0);
-        it->setMaxSpeedFront(0);
-        it->setMaxSpeedLeftRight(0);
-        it->setMaxSpeedUpDown(0);
-        
-        i++;
-        }
-        //Gametype::start();
-        this->addBots(this->numberOfBots_);
-   this->spawnPlayersIfRequested();
-   
-        
-       Gametype::checkStart();
-        
-        i=0;
-     for(ObjectList<Engine>::iterator it = ObjectList<Engine>::begin(); it; ++it)
-        {
-        it->setMaxSpeedBack(this->maxSpeedBack_[i]);
-         it->setMaxSpeedFront(this->maxSpeedFront_[i]);
-         it->setMaxSpeedLeftRight(this->maxSpeedLeftRight_[i]);
-         it->setMaxSpeedUpDown(this->maxSpeedUpDown_[i]);
-         i++;
-         
+    {
+                           this->spawnPlayersIfRequested(); Gametype::checkStart(); 
+                           this->cantMove_=true; 
+         
+                 for(ObjectList<Engine>::iterator it = ObjectList<Engine>::begin(); it; ++it) 
+                                {if(it->getMaxSpeedFront()>0){this->maxSpeedBack_=it->getMaxSpeedBack(); 
+                                this->maxSpeedFront_=it->getMaxSpeedFront(); 
+                                this->maxSpeedLeftRight_=it->getMaxSpeedLeftRight(); 
+                                this->maxSpeedUpDown_=(it->getMaxSpeedUpDown()); 
+                                 }
+                                it->setMaxSpeedBack(0); 
+                                it->setMaxSpeedFront(0); 
+                        it->setMaxSpeedLeftRight(0); 
+                                it->setMaxSpeedUpDown(0); 
+                                 
+                                
+                                } 
+                               
+                               this->addBots(this->numberOfBots_); 
+       
+    }
+    
+    void SpaceRace::tick(float dt){
+    SUPER(SpaceRace,tick,dt);
+    
+    if(!this->isStartCountdownRunning() && this->cantMove_){
+    
+        for(ObjectList<Engine>::iterator it = ObjectList<Engine>::begin(); it; ++it) 
+                                { 
+                                it->setMaxSpeedBack(this->maxSpeedBack_); 
+                                 it->setMaxSpeedFront(this->maxSpeedFront_); 
+                                 it->setMaxSpeedLeftRight(this->maxSpeedLeftRight_); 
+                                 it->setMaxSpeedUpDown(this->maxSpeedUpDown_); 
+                }
+                this->cantMove_= false;
+                
+                std::string message("The match has started! Reach the check points as quickly as possible!");
+        const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
+        ChatManager::message(message);          
       
-        }
-                delete &this->maxSpeedBack_;
-                delete &this->maxSpeedFront_;
-                delete &this->maxSpeedLeftRight_;
-                delete &this->maxSpeedUpDown_;
-        std::string message("The match has started! Reach the check points as quickly as possible!");
-        const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
-        ChatManager::message(message);
-      
+    }
+     
+    
     }
 

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

@@ -34 +34 @@
 #include <set>
 #include <string>
-#include <vector>
+# include <vector>
 
 #include <util/Clock.h>
@@ -69 +69 @@
         void tick(float dt);
         protected:
-
+                
         private:
-        std::vector<float> maxSpeedBack_; std::vector<float> maxSpeedFront_; std::vector<float> maxSpeedLeftRight_; std::vector<float> maxSpeedUpDown_;
+        float maxSpeedBack_; float maxSpeedFront_; float maxSpeedLeftRight_; float maxSpeedUpDown_; 
+        bool cantMove_;
             int checkpointsReached_; //The current number of check points reached by the player.
             std::set<float> scores_; //The times of the players are saved in a set.