Changeset 7897 for code/branches

Timestamp:

Feb 15, 2011, 12:15:43 AM (14 years ago)

Author:

jo

Message:

Problem with the destruction of the vector eachTeamsPlayers - couldn't find a solution yet.

Location:

code/branches/lastmanstanding2/src/orxonox/gametypes

Files:

• LastTeamStanding.cc (modified) (6 diffs)
• LastTeamStanding.h (modified) (1 diff)

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

@@ -46 +46 @@
         this->bForceSpawn_ = true;
         this->lives = 1;//4
-        //this->eachTeamsPlayers.reserve(teams_);
+        this->eachTeamsPlayers.resize(teams_,0);
         this->teamsAlive = 0;
         this->bMinTeamsReached = false;
@@ -59 +59 @@
     {
         this->playerLives_.clear();
-        //this->eachTeamsPlayers.clear();
+        this->eachTeamsPlayers.clear();
         this->timeToAct_.clear();
+        this->inGame_.clear();
         this->playerDelayTime_.clear();
-        this->inGame_.clear();
     }   
 
@@ -75 +75 @@
             playerLives_[player]=getMinLives();//new players only get minimum of lives */
         
-        //if(this->eachTeamsPlayers[getTeam(player)]==0) //if a player is the first in his group, a new team is alive
-          //  this->teamsAlive++;
-        //this->eachTeamsPlayers[getTeam(player)]++; //the number of player in this team is increased
+        if(this->eachTeamsPlayers[getTeam(player)]==0) //if a player is the first in his group, a new team is alive
+            this->teamsAlive++;
+        this->eachTeamsPlayers[getTeam(player)]++; //the number of player in this team is increased
 
         if (teamsAlive>1) // Now the game is allowed to end, since there are at least two teams.
@@ -91 +91 @@
         if (valid_player)
         {
-            //this->eachTeamsPlayers[getTeam(player)]--;       // a player left the team
-            //if(this->eachTeamsPlayers[getTeam(player)] == 0) // if it was the last player a team died
-             //    this->teamsAlive--;
+            this->eachTeamsPlayers[getTeam(player)]--;       // a player left the team
+            if(this->eachTeamsPlayers[getTeam(player)] == 0) // if it was the last player a team died
+                 this->teamsAlive--;
             this->playerLives_.erase(player);
-            //this->eachTeamsPlayers.clear();
             this->timeToAct_.erase(player);
             this->playerDelayTime_.erase(player);
@@ -115 +114 @@
         if (playerLives_[victim->getPlayer()]<=0) //if player lost all lives
         {
-            //this->eachTeamsPlayers[getTeam(victim->getPlayer())]--;
-            //if(eachTeamsPlayers[getTeam(victim->getPlayer())] == 0) //last team member died
+            this->eachTeamsPlayers[getTeam(victim->getPlayer())]--;
+            if(eachTeamsPlayers[getTeam(victim->getPlayer())] == 0) //last team member died
                 this->teamsAlive--;
             const std::string& message = victim->getPlayer()->getName() + " has lost all lives";
@@ -166 +165 @@
         
         this->timeToAct_[player] = timeRemaining + 3.0f + respawnDelay;//reset timer
-        //this->playerDelayTime_[player] = respawnDelay;
+        this->playerDelayTime_[player] = respawnDelay;
         
         std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);

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

@@ -54 +54 @@
             int lives; //!< Standard amount of lives. Each player starts a game with so many lives.
             std::map< PlayerInfo*, int > playerLives_; //!< Each player's lives are stored here.
-            //std::vector<int> eachTeamsPlayers; //!<Number of players in each team. !!!!!!!!!!!!!!
+            std::vector<int> eachTeamsPlayers; //!<Number of players in each team.
             int teamsAlive; //!< Counter counting teams with more than one player remaining.
 //Data for CamperPunishment