Changeset 7699 for code/branches

Timestamp:

Dec 2, 2010, 11:26:05 PM (14 years ago)

Author:

jo

Message:

Finally using the right branch - already compiling, but with memory-leak.

Location:

code/branches/lastmanstanding2

Files:

• data/overlays/lastTeamStandingHUD.oxo (modified) (4 diffs)
• src/orxonox/gametypes/LastTeamStanding.cc (modified) (6 diffs)
• src/orxonox/gametypes/LastTeamStanding.h (modified) (2 diffs)

code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo

@@ -1 +1 @@
 <Template name="LastteamstandingHUD">
-  <OverlayGroup name="DynamicmatcHUD" scale = "1, 1">
+  <OverlayGroup name="LastteamstandingHUD" scale = "1, 1">
 
 <GametypeFadingMessage
@@ -30 +30 @@
 
      showlives     = true
-     showplayers     = false
+     showteams     = false
     />
 
@@ -40 +40 @@
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
-     caption   = "Players: "
+     caption   = "Teams: "
     />
 
@@ -52 +52 @@
 
      showlives     = false
-     showplayers     = true
+     showteams     = true
     />
 

code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc

@@ -52 +52 @@
         this->bHardPunishment=false;
         this->punishDamageRate=0.4f;
-        this->setHUDTemplate("LastTeamStandingHUD");
+        this->setHUDTemplate("LastTeamStandingHUD");//tolowercase:-)
         this->eachTeamsPlayers = new int[teams_];
+        this->bMinPlayersReached = false;
     }
     
-    void LastTeamStanding::~LastTeamStanding()
+    LastTeamStanding::~LastTeamStanding()
     {
         delete[] this->eachTeamsPlayers;
@@ -138 +139 @@
     }
 
-    void LastTeamStanding::end()
+    void LastTeamStanding::end()//TODO!
     {
         Gametype::end();
@@ -171 +172 @@
         if (!player)// only for safety
             return;
-        Deathmatch::playerEntered(player);
+        TeamDeathmatch::playerEntered(player);
         if (teamsAlive<=1)
             playerLives_[player]=lives;
@@ -180 +181 @@
             this->teamsAlive++;
         this->eachTeamsPlayers[getTeam(player)]++;
-        
+        if (teamsAlive>1) // Now the game is allowed to end, since there are at least two teams.
+            bMinPlayersReached=true;
         this->timeToAct_[player]=timeRemaining;
         this->playerDelayTime_[player]=respawnDelay;
@@ -188 +190 @@
     bool LastTeamStanding::playerLeft(PlayerInfo* player)
     {
-        bool valid_player = Deathmatch::playerLeft(player);
+        bool valid_player = TeamDeathmatch::playerLeft(player);
         if (valid_player)
         {
@@ -255 +257 @@
         if(this->hasStarted()&&(!this->hasEnded()))
         {
-            if ((this->hasStarted()&&(teamsAlive<=1)))//last team remaining
+            if (bMinPlayersReached &&(this->hasStarted()&&(teamsAlive<=1)))//last team remaining
             {
                 this->end();

code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.h

@@ -35 +35 @@
 
 #include "OrxonoxPrereqs.h"
-#include "Deathmatch.h"
+#include "TeamDeathmatch.h"
 #include <map>
 #include <vector>
+
+//TODO: Hud doesn load; problem with destructor; teams are not assigned properly; 
 
 namespace orxonox
@@ -63 +65 @@
             virtual void spawnDeadPlayersIfRequested(); //!< Prevents dead players to respawn.
             virtual int getMinLives(); //!< Returns minimum of each player's lives; players with 0 lives are skipped;
-            unsigned int * eachTeamsPlayers; //!<Each teams player's alive.
+            int * eachTeamsPlayers; //!<Each teams player's alive.
+            bool bMinPlayersReached;
 
         public: