Changeset 10724 for code/branches/fabienHS15/src/orxonox/worldentities

Timestamp:

Oct 30, 2015, 7:51:49 PM (9 years ago)

Author:

fvultier

Message:

The weapon system HUD rescales properly if the window size changes.

Location:

code/branches/fabienHS15/src/orxonox/worldentities/pawns

Files:

• SpaceShip.cc (modified) (1 diff)
• SpaceShip.h (modified) (1 diff)

code/branches/fabienHS15/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -297 +297 @@
         }
     }
+
+    void SpaceShip::gainBoostPower(float gainedBoostPower)
+    {
+        this->boostPower_ += gainedBoostPower;
+        
+        if (this->boostPower_ > this->initialBoostPower_)
+        {
+            this->boostPower_ = this->initialBoostPower_;
+        }
+
+        // If the booster is in cooldown mode and we gained boost power, the abort the cooldown.
+        if (this->isBoostCoolingDown() && this->boostPower_ > 0.0f)
+        {
+            timer_.stopTimer();
+            this->boostCooledDown();
+        }
+    }
+
     /**
     @brief

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

@@ -250 +250 @@
             inline float getShakeAmplitude() const
                 { return this->shakeAmplitude_; }
+            /**
+            @brief Add boost power. Is non-negative.
+            @return Returns the current boost power.
+            */
+            void gainBoostPower(float gainedBoostPower);
 
         protected: