Changeset 2971 for code/branches

Timestamp:

May 11, 2009, 5:31:21 PM (16 years ago)

Author:

mockm

Message:

new revision of Gametype UnderAttack: Timerfunction and some color added

Location:

code/branches/gametypes/src/orxonox/objects/gametypes

Files:

• UnderAttack.cc (modified) (6 diffs)
• UnderAttack.h (modified) (2 diffs)

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

@@ -34 +34 @@
 #include "objects/Teamcolourable.h"
 #include "objects/worldentities/TeamSpawnPoint.h"
+#include "util/Convert.h"
 
 #include "network/Host.h"
@@ -43 +44 @@
     {
         RegisterObject(UnderAttack);
-        this->gameTime_ = 30;
+        this->gameTime_ = 90;
         this->teams_ = 2;
         this->destroyer_ = 0;
@@ -49 +50 @@
 
         this->setConfigValues();
+        this->timesequence_ = (int) this->gameTime_;
     }
 
@@ -70 +72 @@
             COUT(0) << message << std::endl;
             Host::Broadcast(message);
+            this->gameEnded_ = true;
         }
     }
@@ -126 +129 @@
         return TeamDeathmatch::allowPawnDeath(victim, originator);
     }
+
+
     void UnderAttack::tick(float dt)
     {
         SUPER(UnderAttack, tick, dt);
 
-        if (this->hasStarted())
+        if (this->hasStarted() && !gameEnded_)
         {
             gameTime_ = gameTime_ - dt;
-            if (gameTime_<= 0 && !gameEnded_)
+            if (gameTime_<= 0)
             {
-                gameEnded_ = true;
+                this->gameEnded_ = true;
                 this->end();
                 std::string message = "Time is up! Team 1 has won!";
@@ -141 +146 @@
                 Host::Broadcast(message);
             }
+
+             //prints gametime
+            if ( gameTime_ <= timesequence_)
+            {
+                std::string message = convertToString(timesequence_) + " sec left!";
+                COUT(0) << message << std::endl;
+                Host::Broadcast(message);
+                if (timesequence_ >= 30 && timesequence_ <= 60)
+                {
+                    timesequence_ = timesequence_ - 10;
+                }
+                else if (timesequence_ <= 30)
+                {
+                    timesequence_ = timesequence_ - 5;
+                }
+                else
+                {
+                    timesequence_ = timesequence_ - 30;
+                }
+            }
         }
     }

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

@@ -46 +46 @@
 
             void setConfigValues();
-
             void tick (float dt);
             void addDestroyer(Destroyer* destroyer);
@@ -62 +61 @@
             unsigned int teams_;
             float gameTime_;
+            int timesequence_;
             bool gameEnded_;
     };