Changeset 2978 for code/branches

Timestamp:

May 17, 2009, 9:23:41 PM (16 years ago)

Author:

Aurelian

Message:

some fixes on the timer, visibility of checkpoint removed (done in the xml-file)

Location:

code/branches/gametypes/src/orxonox

Files:

• objects/gametypes/Asteroids.cc (modified) (2 diffs)
• objects/gametypes/Gametype.h (modified) (2 diffs)
• objects/worldentities/triggers/CheckPoint.cc (modified) (2 diffs)
• overlays/hud/HUDTimer.cc (modified) (1 diff)

code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc

@@ -44 +44 @@
         RegisterObject(Asteroids);
         this->firstCheckpointReached_ = false;
-        this->timeLimit_ = 30;
     }
 
@@ -51 +50 @@
         SUPER(Asteroids, tick, dt);
  
-        if (firstCheckpointReached_)
+        if (firstCheckpointReached_ && !this->timerIsActive_)
         {
-            this->timeLimit_ = this->time_;
             this->startTimer();
         }
 
-        if (this->time_ < 0 && !this->hasEnded())
+        if (this->time_ < 0 && !this->hasEnded() && this->timerIsActive_)
         {
             this->end();

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

@@ -130 +130 @@
 
             inline  void startTimer()
-              { this->timerIsActive_ = true; }
+            { 
+                this->time_ = this->timeLimit_;
+                this->timerIsActive_ = true;
+            }
 
             inline void stopTimer()
@@ -140 +143 @@
             inline bool getTimerIsActive()
               { return timerIsActive_; }
+
+            inline void setTimeLimit(float t)
+              { this->timeLimit_ = t; }
 
             virtual void resetTimer();

code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc

@@ -50 +50 @@
     this->bIsFirst_ = false;
     this->bIsDestination_ = false;
-    this->setVisible(true);
+    //this->setVisible(true);
   }
 
@@ -77 +77 @@
         if (bIsTriggered && bIsFirst_)
         {
+            gametype->setTimeLimit(addTime_);
             gametype->firstCheckpointReached(true);
         }

code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.cc

@@ -63 +63 @@
     if (gametype->getTimerIsActive())
     {
-      this->setCaption(convertToString((int)gametype->getTime()));
+      this->setCaption(convertToString((int)gametype->getTime() + 1));
     }
   }