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

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.cc (modified) (7 diffs)

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

@@ -20 +20 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- *   Author: Val Mikos
+ *   Author:
+ *      Val Mikos
+ *   Co-authors:
+ *      ...
+ *
  */
- 
- 
 
 #include "TeamBaseMatch.h"
 
-
-#include "objects/worldentities/pawns/TeamBaseMatchBase.h" 
+#include "objects/worldentities/pawns/TeamBaseMatchBase.h"
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-
- 
+
 namespace orxonox
 {
     CreateUnloadableFactory(TeamBaseMatch);
 
-
-    // Timer and Creator
     TeamBaseMatch::TeamBaseMatch(BaseObject* creator) : TeamDeathmatch(creator)
     {
@@ -49 +46 @@
         this->pointsTeam2_ = 0;
     }
-     
-    
-    // set the Bases positions using XML
-    void TeamBaseMatch::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(TeamBaseMatch, XMLPort, xmlelement, mode);
-
-//        XMLPortObject(TeamBaseMatch, WorldEntity, setNeutralshape, getNeturalshape, xmlelement, mode); 
-//        XMLPortObject(TeamBaseMatch, WorldEntity, setTeam1shape, getTeam1shape, xmlelement, mode);
-//        XMLPortObject(TeamBaseMatch, WorldEntity, setTeam2shape, getTeam2shape, xmlelement, mode);
-
-//        XMLPortObject(TeamBaseMatch, TeamBaseMatchBase,  addBase, getBase, xmlelement, mode);
-    }
-    
-/*
-    // pretty useless at the moment...should be implemented in the TeamBaseMatchBase class headerfile
-    // State of the Base (controlled, uncontrolled)
-    int TeamBaseMatch::baseState(Base)
-    {
-        if(Enum state_==uncontrolled) return 0;
-        if(Enum state_==controlTeam1) return 1;
-        if(Enum state_==controlTeam2) return 2;
-    }
-*/  
-
 
     // Change the control of the defeated base and respawn it with its initial health
@@ -117 +89 @@
         {
             std::map<PlayerInfo*, int>::const_iterator it1 = this->teamnumbers_.find(pawn1->getPlayer());
-            int teamnrbase = -1;
-            int teamnrplayer = getTeam(pawn1->getPlayer());
-
-            switch(base->getState())
+            int teamnrbase = -1;
+            int teamnrplayer = getTeam(pawn1->getPlayer());
+
+            switch (base->getState())
             {
                 case BaseState::controlTeam1:
@@ -130 +102 @@
                 case BaseState::uncontrolled:
                 default:
-                    teamnrbase = -1;
-            }
-
-
-            if(teamnrbase == teamnrplayer){
-                return false;
-            }
+                    teamnrbase = -1;
+            }
+
+            if (teamnrbase == teamnrplayer)
+                return false;
         }
         return true;
@@ -155 +125 @@
     void TeamBaseMatch::showPoints()
     {
-        
+
         COUT(0) << "Points standing:" << std::endl << "Team 1: "<< pointsTeam1_ << std::endl << "Team 2: " << pointsTeam2_ << std::endl;
         if(pointsTeam1_ >=1700) COUT(0) << "Team 1 is near victory!" << std::endl;
@@ -205 +175 @@
         {
             this->pointsTeam2_ += points;
-        }      
+        }
 
         this->endGame();
@@ -227 +197 @@
         return 0;
     }
-    
+
 }
 
- 
+