Changeset 8951 for code/branches/gamecontent/src/orxonox/worldentities/pawns

Timestamp:

Nov 26, 2011, 10:06:08 AM (13 years ago)

Author:

jo

Message:

Removing interface - no actual need for it, since only two classes are necessary to have a teamnumber. Prepared tutorial level for new HUD feature.

Location:

code/branches/gamecontent/src/orxonox/worldentities/pawns

Files:

• Pawn.cc (modified) (2 diffs)
• Pawn.h (modified) (4 diffs)

code/branches/gamecontent/src/orxonox/worldentities/pawns/Pawn.cc

@@ -60 +60 @@
         this->bReload_ = false;
 
-        this->team_ = -1;
         this->health_ = 0;
         this->maxHealth_ = 0;
@@ -110 +109 @@
     {
         SUPER(Pawn, XMLPort, xmlelement, mode);
-
-        XMLPortParam(Pawn, "team", setTeam, getTeam, xmlelement, mode).defaultValues(-1);
 
         XMLPortParam(Pawn, "health", setHealth, getHealth, xmlelement, mode).defaultValues(100);

code/branches/gamecontent/src/orxonox/worldentities/pawns/Pawn.h

@@ -35 +35 @@
 #include "interfaces/PickupCarrier.h"
 #include "interfaces/RadarViewable.h"
-#include "interfaces/PartyMember.h"
 #include "worldentities/ControllableEntity.h"
 
@@ -41 +40 @@
 { // tolua_export
     class _OrxonoxExport Pawn // tolua_export
-        : public ControllableEntity, public RadarViewable, public PickupCarrier//, public PartyMember
+        : public ControllableEntity, public RadarViewable, public PickupCarrier
     { // tolua_export
         friend class WeaponSystem;
@@ -55 +54 @@
                 { return this->bAlive_; }
 
-            inline void setTeam(int team)
-                { this->team_ = team; }
-            inline float getTeam() const
-                { return this->team_; }
 
             virtual void setHealth(float health);
@@ -200 +195 @@
                 { return NULL; }
 
-            int team_;
 
             float health_;