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

Timestamp:

May 23, 2009, 7:04:10 PM (15 years ago)

Author:

landauf

Message:

some small adjustments in all the new gametype classes

File:

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

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

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Val Mikos
  *   Co-authors:
- *      Val Mikos
+ *      ...
  *
  */
@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include <vector>
 #include <set>
-
 #include "TeamDeathmatch.h"
 #include "tools/Timer.h"
 
-
-
 namespace orxonox
 {
-    class TeamBaseMatchBase;
-
-
     class _OrxonoxExport TeamBaseMatch : public TeamDeathmatch
     {
         public:
             TeamBaseMatch(BaseObject* creator);
-            
-            // if class closes, close everything           
             virtual ~TeamBaseMatch() {}
-            
-            
-            // set Base positions with XML 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-                        
+
             virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);
+            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator);
 
-            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator);
-
-
-
-            // give information about the state of a base 
-            // (this should be pretty useless atm)
-//            virtual int baseState(Base);
-            
-            virtual void playerScored(PlayerInfo* player);
+            virtual void playerScored(PlayerInfo* player);
             virtual void showPoints();
             virtual void endGame();
-            
+
             void addBase(TeamBaseMatchBase* base);
             TeamBaseMatchBase* getBase(unsigned int index) const;
 
             void addTeamPoints(int team, int points);
-            
-            
-            
-            
+
         protected:
             void winPoints();
 
-
-            bool pawnsAreInTheSameTeam(Pawn* pawn1, TeamBaseMatchBase* base);
+            bool pawnsAreInTheSameTeam(Pawn* pawn1, TeamBaseMatchBase* base);
             using TeamDeathmatch::pawnsAreInTheSameTeam;
 
@@ -89 +65 @@
             Timer<TeamBaseMatch> scoreTimer_;
             Timer<TeamBaseMatch> outputTimer_;
-            
+
             //points for each team
             int pointsTeam1_;