Changeset 2934 for code/branches

Timestamp:

Apr 27, 2009, 4:26:49 PM (16 years ago)

Author:

vmikos

Message:

fast endversion TeamBaseMatch

Location:

code/branches/gametypes/src/orxonox

Files:

• gamestates/GSLevel.cc (modified) (1 diff)
• objects/gametypes/CMakeLists.txt (modified) (1 diff)
• objects/gametypes/TeamBaseMatch.cc (modified) (5 diffs)
• objects/gametypes/TeamBaseMatch.h (modified) (4 diffs)
• objects/worldentities/pawns/CMakeLists.txt (modified) (1 diff)
• objects/worldentities/pawns/TeamBaseMatchBase.cc (added)
• objects/worldentities/pawns/TeamBaseMatchBase.h (modified) (2 diffs)

code/branches/gametypes/src/orxonox/gamestates/GSLevel.cc

@@ -49 +49 @@
 namespace orxonox
 {
-    SetCommandLineArgument(level, "presentation_dm.oxw").shortcut("l");
+    SetCommandLineArgument(level, "teambasematchlevel.oxw").shortcut("l");
 
     GSLevel::GSLevel()

code/branches/gametypes/src/orxonox/objects/gametypes/CMakeLists.txt

@@ -3 +3 @@
   Deathmatch.cc
   TeamDeathmatch.cc
+  TeamBaseMatch.cc
   Pong.cc
   UnderAttack.cc

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

@@ -25 +25 @@
  
 
-#include TeamBaseMatch.h
+#include "TeamBaseMatch.h"
 
 
 //implement this! not done yet!
 #include "objects/worldentities/pawns/TeamBaseMatchBase.h" 
- 
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+
  
 namespace orxonox
@@ -38 +40 @@
 
     // Timer and Creator
-    TeamBaseMatch::TeamBaseMatch(BaseObject* creator) : TeamDeathMatch(creator)
+    TeamBaseMatch::TeamBaseMatch(BaseObject* creator) : TeamDeathmatch(creator)
     {
         RegisterObject(TeamBaseMatch);
@@ -53 +55 @@
     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);
+//        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)
@@ -68 +73 @@
         if(Enum state_==controlTeam2) return 2;
     }
-    
+*/  
+
+
+    // Change the control of the defeated base and respawn it with its initial health
     bool TeamBaseMatch::allowPawnDeath(Pawn* victim, Pawn* originator)
     {
-        set::set<TeamBaseMatchBase*>::const_iterator it = this->bases_.find(victim);
-        if (it != this->bases_.end() && victim)
+        TeamBaseMatchBase* base = dynamic_cast<TeamBaseMatchBase*>(victim);
+        if (base)
         {
-            TeamBaseMatchBase* base = dynamic_cast<TeamBaseMatchBase*>(victim);
-            if (base)
+            std::set<TeamBaseMatchBase*>::const_iterator it = this->bases_.find(base);
+            if (it != this->bases_.end())
             {
                 int teamnr = this->getTeam(originator->getPlayer());
@@ -140 +148 @@
     }
 
-    void addTeamPoints(int team, int points)
+
+    // this function is called by the function winPoints() which adds points to the teams for every base and killed openents at a certain time
+    void TeamBaseMatch::addTeamPoints(int team, int points)
     {
-        if(player && teamnr == 0)
+        if(team == 0)
         {
             this->pointsTeam1_ += points;
         }
-        if(player && teamnr == 1)
+        if(team == 1)
         {
             this->pointsTeam2_ += points;

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

@@ -36 +36 @@
 
 #include "TeamDeathmatch.h"
-#include "util/Timer.h"
+#include "tools/Timer.h"
 
 
@@ -42 +42 @@
 namespace orxonox
 {
- 
+    class TeamBaseMatchBase;
 
 
@@ -48 +48 @@
     {
         public:
-            TeamBasematch(BaseObject* creator);
+            TeamBaseMatch(BaseObject* creator);
             
             // if class closes, close everything           
@@ -60 +60 @@
 
             // give information about the state of a base 
-            virtual int baseState(Base);
+            // (this should be pretty useless atm)
+//            virtual int baseState(Base);
             
             virtual void playerScored(PlayerInfo* player);

code/branches/gametypes/src/orxonox/objects/worldentities/pawns/CMakeLists.txt

@@ -3 +3 @@
   Pawn.cc
   SpaceShip.cc
+  TeamBaseMatchBase.cc
   Destroyer.cc
 )

code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h

@@ -39 +39 @@
 #define _TeamBaseMatchBase_H__
 
-#include "pawn.h"
+#include "Pawn.h"
 
 namespace orxonox
@@ -55 +55 @@
     }
 
-    struct Base
-    {
-        BaseState::Enum state_;
-    };
 
-
-
-
-
-
-    class _OrxonoxExport TeamBaseMatchBase : public RadarViewable
+    class _OrxonoxExport TeamBaseMatchBase : public Pawn
     {
         public:
             TeamBaseMatchBase(BaseObject* creator);
 
-            // if class closes, close everything  
-            virtual ~TeamBaseMatchBase();
-            
-            virtual void setState(base)
-            {
-                
-
+            // if class closes, close everything  
+            virtual ~TeamBaseMatchBase() {}
+             
+             
+             
+            // Set the state of a base to whatever the argument of the function is 
+            void setState(BaseState::Enum state)
+            {
+                this->state_ = state;
             }
-            virtual enum getState(base);
-
-            
 
 
-
-        protected:
+            // Get the state of a base as a return value 
+            BaseState::Enum getState()
+            {
+                return this->state_;
+            }
 
 
+        protected:
 
-
-
- 
+            BaseState::Enum state_;
+    };
 }