Changeset 8673 for code/branches/presentation/src/orxonox/worldentities/pawns

Timestamp:

May 29, 2011, 11:59:17 PM (14 years ago)

Author:

dafrick

Message:

Merging hudimprovements branch into presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/SpaceShip.h (modified) (1 diff)

code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -88 +88 @@
                 { return this->bBoost_; }
 
+            inline float getBoostPower() const
+                { return this->boostPower_; }
+            inline float getInitialBoostPower() const
+                { return this->initialBoostPower_; }
+
+            inline bool isBoostCoolingDown() const
+                { return bBoostCooldown_; }
+
         protected:
             virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const;