Changeset 11283 for code/branches

Timestamp:

Nov 14, 2016, 2:34:29 PM (8 years ago)

Author:

bberabi

Message:

asdas

Location:

code/branches/SpaceRace_HS16/src

Files:

• modules/gametypes/SpaceRace.cc (modified) (6 diffs)
• orxonox/infos/Bot.cc (modified) (1 diff)
• orxonox/infos/GametypeInfo.h (modified) (1 diff)

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

@@ -79 +79 @@
     {
         Gametype::start();
-
    if (true)
         {
@@ -138 +137 @@
 
 
-        // spawns the players when the countdown starts, but deactivates their engines
+       /* // spawns the players when the countdown starts, but deactivates their engines
         if (this->isStartCountdownRunning() && !this->cantMove_)
         {
@@ -149 +148 @@
 
 
-gtInfo_->setStartCountdown(10.0);
+gtinfo_->setStartCountdown(50.0);
    
         
-            /*this->spawnPlayersIfRequested();
-            this->cantMove_ = true;
-
-            for (Engine* engine : ObjectList<Engine>()){
-                engine->setActive(false);
-                }
-
-            
-            
-         std::string message("BE FAST BE FIRST");
-        this->getGametypeInfo()->sendAnnounceMessage(message);
-        ChatManager::message(message);
-
-Timer* countdownTimer = new Timer();
-        countdownTimer->setTimer(11, false, createExecutor(createFunctor(&SpaceRace::countdownFinished, this)));*/
 
 
@@ -187 +171 @@
             this->getGametypeInfo()->sendAnnounceMessage(message);
             ChatManager::message(message);
-        }
+        }*/
     
 }
@@ -199 +183 @@
         int ms = this->clock_.getMilliseconds() % 1000;
 
-        const std::string& message = "Checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1)
-            + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds.";
-        this->getGametypeInfo()->sendAnnounceMessage(message);
-        ChatManager::message(message);
+       
+    
+        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);
+
     }
 
@@ -215 +202 @@
     for (Engine* engine : ObjectList<Engine>())
                 engine->setActive(true);
+
+
     
 }

code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc

@@ -68 +68 @@
         static const std::string names[] =
         {
+            "Berkay Berabi",
+            "Louis  Meile"
             "Dr. Julius No",
             "Rosa Klebb",

code/branches/SpaceRace_HS16/src/orxonox/infos/GametypeInfo.h

@@ -133 +133 @@
             void dispatchStaticMessage(const std::string& message,const ColourValue& colour) const;
             void dispatchFadingMessage(const std::string& message) const;
+            void setStartCountdown(float countdown); // Set the start countdown to the input value.
+
 
         protected:
             void start(void); // Inform the GametypeInfo that the game has started.
             void end(void); // Inform the GametypeInfo that the game has ended.
-            void setStartCountdown(float countdown); // Set the start countdown to the input value.
             void countdownStartCountdown(float countDown); // Count down the start countdown by the specified value.
             void countDown(); // Count down the start countdown counter.