Changeset 2824 for code/branches/miniprojects/src/orxonox/objects/gametypes/Gametype.cc

Timestamp:

Mar 23, 2009, 11:26:46 AM (15 years ago)

Author:

landauf

Message:

Added "Pong" minigame

File:

• code/branches/miniprojects/src/orxonox/objects/gametypes/Gametype.cc (modified) (2 diffs)

code/branches/miniprojects/src/orxonox/objects/gametypes/Gametype.cc

@@ -200 +200 @@
                 // Reward killer
                 if (killer)
-                {
-                    std::map<PlayerInfo*, Player>::iterator itKiller = this->players_.find(killer->getPlayer());
-                    if (itKiller != this->players_.end())
-                    {
-                        this->playerScored(itKiller->second);
-                    }
-                    else
-                        COUT(2) << "Warning: Killing Pawn was not in the playerlist" << std::endl;
-                }
+                    this->playerScored(killer->getPlayer());
 
                 ControllableEntity* entity = this->defaultControllableEntity_.fabricate(victim->getCreator());
@@ -228 +220 @@
     }
 
-    void Gametype::playerScored(Player& player)
-    {
-        player.frags_++;
+    void Gametype::playerScored(PlayerInfo* player)
+    {
+        std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);
+        if (it != this->players_.end())
+            it->second.frags_++;
     }