Changeset 8942 for code/branches/gamecontent/src/orxonox/worldentities

Timestamp:

Nov 18, 2011, 6:52:21 PM (13 years ago)

Author:

jo

Message:

Pawn&SpaceShip Colouring via XML works. Quick&Dirty implementation though. A clean version is going to follow.

Location:

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

Files:

• Pawn.cc (modified) (3 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 +111 @@
         SUPER(Pawn, XMLPort, xmlelement, mode);
 
+        XMLPortParam(Pawn, "team", setTeam, getTeam, xmlelement, mode).defaultValues(-1);
+
         XMLPortParam(Pawn, "health", setHealth, getHealth, xmlelement, mode).defaultValues(100);
         XMLPortParam(Pawn, "maxhealth", setMaxHealth, getMaxHealth, xmlelement, mode).defaultValues(200);
@@ -129 +132 @@
         XMLPortParam(Pawn, "reloadrate", setReloadRate, getReloadRate, xmlelement, mode).defaultValues(0);
         XMLPortParam(Pawn, "reloadwaittime", setReloadWaitTime, getReloadWaitTime, xmlelement, mode).defaultValues(1.0f);
+
+
     }
 

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"
 
@@ -40 +41 @@
 { // tolua_export
     class _OrxonoxExport Pawn // tolua_export
-        : public ControllableEntity, public RadarViewable, public PickupCarrier
+        : public ControllableEntity, public RadarViewable, public PickupCarrier//, public PartyMember
     { // tolua_export
         friend class WeaponSystem;
@@ -53 +54 @@
             inline bool isAlive() const
                 { return this->bAlive_; }
+
+            inline void setTeam(int team)
+                { this->team_ = team; }
+            inline float getTeam() const
+                { return this->team_; }
 
             virtual void setHealth(float health);
@@ -194 +200 @@
                 { return NULL; }
 
+            int team_;
+
             float health_;
             float maxHealth_;