Changeset 11034 for code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h

Timestamp:

Jan 4, 2016, 10:13:21 AM (8 years ago)

Author:

fvultier

Message:

Merge latest changes from fabienHS15 to presentationHS15.

Location:

code/branches/presentationHS15

Files:

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

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

@@ -64 +64 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void tick(float dt);
 
@@ -133 +134 @@
 
             virtual void decreaseShieldRechargeCountdownTime(float dt);
+
+            /** @brief Sets the state of the pawns vulnerability. @param bVulnerable */
+            inline void setVulnerable(bool bVulnerable)
+            {
+                if (this->bVulnerable_ != bVulnerable)
+                {
+                    this->bVulnerable_ = bVulnerable;
+                    this->changedVulnerability();
+                }
+            }
+            /** @brief Returns the state of the pawns vulnerability. @return The state of the vulnerability */
+            inline const bool& isVulnerable() const { return this->bVulnerable_; }
+            /** @brief This function gets called if the vulnerability of the pawn changes. */
+            virtual void changedVulnerability();
 
             inline ControllableEntity* getLastHitOriginator() const
@@ -219 +234 @@
 
             bool bAlive_;
+            bool bVulnerable_; ///< If false the pawn may not ged damaged
 
             virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const