Changeset 2985 for code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h

Timestamp:

May 18, 2009, 5:01:45 PM (15 years ago)

Author:

vmikos

Message:

final version

File:

• code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h (modified) (3 diffs)

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

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      Val Mikos
  *
  */
@@ -59 +59 @@
             virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);
 
+            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator);
+
+
+
             // give information about the state of a base 
             // (this should be pretty useless atm)
@@ -78 +82 @@
             void winPoints();
 
+
+            bool pawnsAreInTheSameTeam(Pawn* pawn1, TeamBaseMatchBase* base);
+            using TeamDeathmatch::pawnsAreInTheSameTeam;
+
             std::set<TeamBaseMatchBase*> bases_;
             Timer<TeamBaseMatch> scoreTimer_;