Changeset 9339 for code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.cc

Timestamp:

Jul 30, 2012, 10:41:03 PM (12 years ago)

Author:

jo

Message:

Found reason why players are not always detected correctly: numberOfPlayers only count players that have been added before the gametype started.

File:

• code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.cc (modified) (3 diffs)

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;
     }
 
@@ -191 +192 @@
         {
             this->players_.erase(it);
+            orxout() << "# Players: " << this->getNumberOfPlayers() <<endl;
             return true;
         }
@@ -301 +303 @@
     }
 
-    void Gametype::playerScored(PlayerInfo* player)
+    void Gametype::playerScored(PlayerInfo* player, int score)
     {
         std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);
         if (it != this->players_.end())
-            it->second.frags_++;
+            it->second.frags_ += score;
     }