Changeset 8980 for code/branches/presentation2011/src/orxonox/worldentities/pawns

Timestamp:

Dec 14, 2011, 2:38:37 PM (13 years ago)

Author:

jo

Message:

teamgametype merged into trunk

Location:

code/branches/presentation2011

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)

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

@@ -129 +129 @@
         XMLPortParam(Pawn, "reloadrate", setReloadRate, getReloadRate, xmlelement, mode).defaultValues(0);
         XMLPortParam(Pawn, "reloadwaittime", setReloadWaitTime, getReloadWaitTime, xmlelement, mode).defaultValues(1.0f);
+
+
     }
 
@@ -455 +457 @@
         SUPER(Pawn, changedActivity);
 
-        this->setRadarVisibility(this->isActive());
+        this->setRadarVisibility(this->isVisible());
     }
 

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

@@ -53 +53 @@
             inline bool isAlive() const
                 { return this->bAlive_; }
+
 
             virtual void setHealth(float health);
@@ -194 +195 @@
                 { return NULL; }
 
+
             float health_;
             float maxHealth_;