[Orxonox-commit 4670] r9341 - code/branches/presentation2012merge/src/orxonox/gametypes

[jo at orxonox.net]

Author: jo
Date: 2012-08-21 19:28:51 +0200 (Tue, 21 Aug 2012)
New Revision: 9341

Modified:
   code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc
   code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.cc
   code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.h
Log:
Corrected getNumberOfPlayers().

Modified: code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc
===================================================================
--- code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc	2012-08-20 14:46:52 UTC (rev 9340)
+++ code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc	2012-08-21 17:28:51 UTC (rev 9341)
@@ -335,8 +335,6 @@
         playerParty_[player]=chaser; //Set playerparty
         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);
     }
@@ -356,8 +354,6 @@
             ChatManager::message(message);
             //remove player from map
             playerParty_.erase (player);
-            orxout() << "# Players(2) : " << this->getNumberOfPlayers() <<endl;
-            orxout() << "# Players(3): " << this->getPlayerCount() <<endl;
             //adjust player parties
             evaluatePlayerParties();
         }

Modified: code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.cc
===================================================================
--- code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.cc	2012-08-20 14:46:52 UTC (rev 9340)
+++ code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.cc	2012-08-21 17:28:51 UTC (rev 9341)
@@ -182,7 +182,6 @@
     {
         this->players_[player].state_ = PlayerState::Joined;
         this->gtinfo_->playerEntered(player);
-        orxout() << "# Players: " << this->getNumberOfPlayers() <<endl;
     }
 
     bool Gametype::playerLeft(PlayerInfo* player)
@@ -191,7 +190,6 @@
         if (it != this->players_.end())
         {
             this->players_.erase(it);
-            orxout() << "# Players: " << this->getNumberOfPlayers() <<endl;
             return true;
         }
         return false;

Modified: code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.h
===================================================================
--- code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.h	2012-08-20 14:46:52 UTC (rev 9340)
+++ code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.h	2012-08-21 17:28:51 UTC (rev 9341)
@@ -153,12 +153,13 @@
             virtual void resetTimer(float t);
 
             /**
-            @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:
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;