Changeset 2903 for code/branches/gametypes/src/orxonox/objects/gametypes

Timestamp:

Apr 6, 2009, 4:48:32 PM (15 years ago)

Author:

scheusso

Message:

merged changes made to trunk (r2902) into branch

Location:

code/branches/gametypes/src/orxonox/objects/gametypes

Files:

• TeamBaseMatch.cc (added)
• TeamBaseMatch.h (added)
• TeamDeathmatch.cc (modified) (1 diff)
• TeamDeathmatch.h (modified) (1 diff)

code/branches/gametypes/src/orxonox/objects/gametypes/TeamDeathmatch.cc

@@ -189 +189 @@
         return false;
     }
+
+    int TeamDeathmatch::getTeam(PlayerInfo* player)
+    {
+        std::map<PlayerInfo*, int>::const_iterator it_player = this->teamnumbers_.find(player);
+        if (it_player != this->teamnumbers_.end())
+            return it_player->second;
+        else
+            return -1;
+    }
 }

code/branches/gametypes/src/orxonox/objects/gametypes/TeamDeathmatch.h

@@ -58 +58 @@
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
             bool pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2);
+            int getTeam(PlayerInfo* player);
 
             std::map<PlayerInfo*, int> teamnumbers_;