Changeset 8616 for code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.cc

Timestamp:

May 26, 2011, 10:03:32 PM (13 years ago)

Author:

msalomon

Message:

RaceCheckPoints with a time limit and the version of the level for the presentation.

File:

• code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.cc (modified) (5 diffs)

code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.cc

@@ -32 +32 @@
 #include "core/XMLPort.h"
 #include "SpaceRace.h"
+#include "util/Convert.h"
 
 namespace orxonox
@@ -47 +48 @@
         this->bTimeLimit_ = 0;
         
-        this->setRadarObjectColour(ColourValue::Red);
-        this->setRadarObjectShape(RadarViewable::Dot);
+        this->setRadarObjectColour(ColourValue::Blue);
+        this->setRadarObjectShape(RadarViewable::Triangle);
         this->setRadarVisibility(false);
     }
@@ -63 +64 @@
         if (this->getCheckpointIndex() == gametype->getCheckpointsReached()) this->setRadarVisibility(true);
         else  this->setRadarVisibility(false);
-        
-        if (this->bTimeLimit_ != 0 && gametype->getTimerIsActive()) {
-          float time = gametype->getTime() - this->bTimeLimit_;
-          if (time > 0) {
-            gametype->timeIsUp();
-            gametype->end();
-          }
-        }
     }
 
@@ -92 +85 @@
             if (this->getCheckpointIndex() == gametype->getCheckpointsReached() && bIsTriggered)
             {
-                if (this->getLast())
+                gametype->clock_->capture();
+                float time = gametype->clock_->getSecondsPrecise();
+                if (this->bTimeLimit_!=0 && time > this->bTimeLimit_) {
+                  gametype->timeIsUp();
+                  gametype->end();
+                }
+                else if (this->getLast())
                 {
                   gametype->end();
@@ -105 +104 @@
     }
     
+    void RaceCheckPoint::setTimelimit(float timeLimit)
+            { 
+              this->bTimeLimit_ = timeLimit;
+              if (this->bTimeLimit_ != 0)
+              {
+                  SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype().get());
+                  if (gametype)
+                  {
+                     const std::string& message =  "You have " + multi_cast<std::string>(this->bTimeLimit_)
+                                                   + " seconds to reach the check point " + multi_cast<std::string>(this->bCheckpointIndex_+1) + "\n";
+                     COUT(0) << message;
+                     const_cast<GametypeInfo*>(gametype->getGametypeInfo())->sendAnnounceMessage(message);
+                  }
+              }
+            }
+    
 }