Changeset 3104 for code/trunk

Timestamp:

May 28, 2009, 5:37:34 AM (16 years ago)

Author:

landauf

Message:

Added two new HUD-elements for TeamBaseMatch and UnderAttack

Location:

code/trunk/src/orxonox

Files:

• objects/gametypes/TeamBaseMatch.cc (modified) (3 diffs)
• objects/gametypes/TeamBaseMatch.h (modified) (1 diff)
• objects/gametypes/UnderAttack.cc (modified) (1 diff)
• overlays/hud/CMakeLists.txt (modified) (1 diff)
• overlays/hud/TeamBaseMatchScore.cc (added)
• overlays/hud/TeamBaseMatchScore.h (added)
• overlays/hud/UnderAttackHealthBar.cc (added)
• overlays/hud/UnderAttackHealthBar.h (added)

code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc

@@ -46 +46 @@
         this->pointsTeam1_ = 0;
         this->pointsTeam2_ = 0;
+
+        this->setHUDTemplate("TeamBaseMatchHUD");
     }
 
@@ -54 +56 @@
         if (base)
         {
-            if ( !originator )
+            if (!originator)
                 return false;
+
             std::set<TeamBaseMatchBase*>::const_iterator it = this->bases_.find(base);
             if (it != this->bases_.end())
@@ -217 +220 @@
     }
 
+    int TeamBaseMatch::getTeamPoints(int team)
+    {
+        if(team == 0)
+        {
+            return this->pointsTeam1_;
+        }
+        if(team == 1)
+        {
+            return this->pointsTeam2_;
+        }
+
+        return 0;
+    }
+
+    int TeamBaseMatch::getTeamBases(int team)
+    {
+        int count = 0;
+
+        for (std::set<TeamBaseMatchBase*>::const_iterator it = this->bases_.begin(); it != this->bases_.end(); ++it)
+        {
+            if ((*it)->getState() == BaseState::controlTeam1 && team == 0)
+                count++;
+            if ((*it)->getState() == BaseState::controlTeam2 && team == 1)
+                count++;
+        }
+
+        return count;
+    }
+
     void TeamBaseMatch::addBase(TeamBaseMatchBase* base)
     {

code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.h

@@ -55 +55 @@
 
             void addTeamPoints(int team, int points);
+            int getTeamPoints(int team);
+            int getTeamBases(int team);
 
         protected:

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

@@ -49 +49 @@
         this->destroyer_ = 0;
         this->gameEnded_ = false;
+
+        this->setHUDTemplate("UnderAttackHUD");
 
         this->setConfigValues();

code/trunk/src/orxonox/overlays/hud/CMakeLists.txt

@@ -12 +12 @@
   DeathMessage.cc
   PongScore.cc
+  UnderAttackHealthBar.cc
+  TeamBaseMatchScore.cc
 )