Changeset 9341 for code/branches/presentation2012merge/src

Timestamp:

Aug 21, 2012, 7:28:51 PM (12 years ago)

Author:

jo

Message:

Corrected getNumberOfPlayers().

Location:

code/branches/presentation2012merge/src/orxonox/gametypes

Files:

• Dynamicmatch.cc (modified) (2 diffs)
• Gametype.cc (modified) (2 diffs)
• Gametype.h (modified) (1 diff)

code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc

@@ -336 +336 @@
         numberOf[chaser]++;
         Gametype::playerEntered(player);
-        orxout() << "# Players(2) : " << this->getNumberOfPlayers() <<endl;
-        orxout() << "# Players(3): " << this->getPlayerCount() <<endl;
         const std::string& message = player->getName() + " entered the game";
         ChatManager::message(message);
@@ -357 +355 @@
             //remove player from map
             playerParty_.erase (player);
-            orxout() << "# Players(2) : " << this->getNumberOfPlayers() <<endl;
-            orxout() << "# Players(3): " << this->getPlayerCount() <<endl;
             //adjust player parties
             evaluatePlayerParties();

code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.cc

@@ -183 +183 @@
         this->players_[player].state_ = PlayerState::Joined;
         this->gtinfo_->playerEntered(player);
-        orxout() << "# Players: " << this->getNumberOfPlayers() <<endl;
     }
 
@@ -192 +191 @@
         {
             this->players_.erase(it);
-            orxout() << "# Players: " << this->getNumberOfPlayers() <<endl;
             return true;
         }

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

@@ -154 +154 @@
 
             /**
-            @brief Get number of Players.
-            Note that only those players are counted that were added before the game started.
+            @brief Get number of Players in game.
             */
             inline unsigned int getNumberOfPlayers() const
-                { return this->gtinfo_->getNumberOfPlayers(); }
+                { return this->players_.size(); }
+
+
 
         protected: