Changeset 9232 for code/branches/captureTheFlag/src/orxonox/worldentities

Timestamp:

May 23, 2012, 5:56:57 PM (13 years ago)

Author:

decapitb

Message:

safety checkin

Location:

code/branches/captureTheFlag

Files:

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

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

@@ -161 +161 @@
             inline unsigned int getExplosionChunks() const
                 { return this->numexplosionchunks_; }
+            inline bool hasFlag() const
+                { return this->hasFlag_; }
+            inline void setHasFlag(bool hasFlag)
+                { this->hasFlag_ = hasFlag; }
 
             virtual void startLocalHumanControl();
@@ -207 +211 @@
             float reloadWaitTime_;
             float reloadWaitCountdown_;
+            bool hasFlag_;
 
             WeakPtr<Pawn> lastHitOriginator_;