Changeset 11720 for code/trunk/src/modules/gametypes/SpaceRace.cc

Timestamp:

Feb 4, 2018, 4:58:37 PM (6 years ago)

Author:

landauf

Message:

[SpaceRace_HS16] reverted some unwanted changes and fixed formatting a little bit

File:

• code/trunk/src/modules/gametypes/SpaceRace.cc (modified) (10 diffs)

code/trunk/src/modules/gametypes/SpaceRace.cc

@@ -80 +80 @@
         RegisterObject(SpaceRace);
 
-        this->botclass_ = Class(SpaceRaceBot); //ClassByString("")
+        this->botclass_ = Class(SpaceRaceBot);
         this->cantMove_ = false;
         this->bTimeIsUp_ = false;
-        this->setConfigValues();
 
         this->numberOfBots_ = 5; // quick fix: don't allow default-bots to enter the race 
@@ -89 +88 @@
     }
 
-  void SpaceRace::setConfigValues()
-    {
-       
-    
-    }
-
     void SpaceRace::start()
     {
-    // define spawn positions of the 5 bots
+        // define spawn positions of the 5 bots
 
         int startpos[15];
@@ -120 +113 @@
         startpos[13] =-40;
         startpos[14] =80;
-        
-
-
 
         Gametype::start();
-   if (true)
-        {
-            this->spawnPlayersIfRequested();
-            this->cantMove_ = true;
-            //players are unable to move while countdown is running
-            for (Engine* engine : ObjectList<Engine>()){
-                engine->setActive(false);
-                
-
-            }
-           //append spawn positions to bots
-           int a,b,c;
-            a=0;
-            b=1;
-            c=2;
-              for (SpaceRaceBot* bot : ObjectList<SpaceRaceBot>()){
-                bot->getControllableEntity()->setPosition(startpos[a],startpos[b],startpos[c]);
-               a= a+3;
-               b = b+3; 
-               c+= 3;
-            }
-
-
-        }
-
-                                                
+
+        this->spawnPlayersIfRequested();
+        this->cantMove_ = true;
+        //players are unable to move while countdown is running
+        for (Engine* engine : ObjectList<Engine>())
+        {
+            engine->setActive(false);
+        }
+
+        //append spawn positions to bots
+        int a,b,c;
+        a=0;
+        b=1;
+        c=2;
+
+        for (SpaceRaceBot* bot : ObjectList<SpaceRaceBot>())
+        {
+            bot->getControllableEntity()->setPosition(startpos[a], startpos[b], startpos[c]);
+            a += 3;
+            b += 3;
+            c += 3;
+        }
 
         std::string message("Use headphones to hear the countdown!");
@@ -156 +142 @@
         ChatManager::message(message);
 
-//after 11 seconds , countdownFinished function is called to activate bots` engines
-Timer* countdownTimer = new Timer();
+        //after 11 seconds , countdownFinished function is called to activate bots` engines
+        Timer* countdownTimer = new Timer();
         countdownTimer->setTimer(11, false, createExecutor(createFunctor(&SpaceRace::countdownFinished, this)));
     }
@@ -189 +175 @@
     }
 
-
-void SpaceRace::tick(float dt)
-    {
-        SUPER(SpaceRace,tick,dt);
-}
-
     void SpaceRace::newCheckpointReached(RaceCheckPoint* checkpoint, PlayerInfo* player)
     {
@@ -207 +187 @@
         const std::string& message = player->getName() + " reached the checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1) 
         + "after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds.";
- this->getGametypeInfo()->sendAnnounceMessage(message);
-        ChatManager::message(message);
-
-    }
-
- void SpaceRace::countdownFinished()//activates the engines of all players 
+        this->getGametypeInfo()->sendAnnounceMessage(message);
+        ChatManager::message(message);
+
+    }
+
+    void SpaceRace::countdownFinished()//activates the engines of all players
     {
 
@@ -220 +200 @@
 
 
-    for (Engine* engine : ObjectList<Engine>())
-                engine->setActive(true);
-
-
-    
-}
-
- void SpaceRace::playerEntered(PlayerInfo* player)
+        for (Engine* engine : ObjectList<Engine>())
+            engine->setActive(true);
+    }
+
+    void SpaceRace::playerEntered(PlayerInfo* player)
     {
         Gametype::playerEntered(player);
@@ -236 +213 @@
 
 
- void SpaceRace::addBots(unsigned int amount) //function that add the bots to the game 
+    void SpaceRace::addBots(unsigned int amount) //function that add the bots to the game
     {
         for (unsigned int i = 1; i <= amount; ++i){
@@ -244 +221 @@
 
 
-//set bot configurations
+    //set bot configurations
     bool SpaceRace::allowPawnHit(Pawn* victim, Pawn* originator)
     {
@@ -255 +232 @@
     }
 
-    bool SpaceRace::allowPawnDeath(Pawn* victim, Pawn* originator)// false because the bots can not recognize the objects and die to early 
-                                                                    //if they can 
+    bool SpaceRace::allowPawnDeath(Pawn* victim, Pawn* originator)// false because the bots can not recognize the objects and die to earlyif they can
     {
         return false;