Changeset 10260 for code/trunk/src/modules/jump/Jump.cc

Timestamp:

Feb 6, 2015, 11:03:00 PM (9 years ago)

Author:

landauf

Message:

merged the latest changes from pickupsFS14 to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/jump/Jump.cc (modified) (1 diff)

code/trunk/src/modules/jump/Jump.cc

@@ -1271 +1271 @@
     }
 
+    float Jump::getFuel() const
+    {
+        if (this->figure_ != NULL)
+        {
+            if (this->figure_->rocketActive_ != NULL)
+            {
+                return this->figure_->rocketActive_->getFuelState();
+            }
+            else if (this->figure_->propellerActive_ != NULL)
+            {
+                return this->figure_->propellerActive_->getFuelState();
+            }
+            else if (this->figure_->shieldActive_ != NULL)
+            {
+                return this->figure_->shieldActive_->getFuelState();
+            }
+            else if (this->figure_->bootsActive_ != NULL)
+            {
+                return this->figure_->bootsActive_->getFuelState();
+            }
+        }
+
+        return 0.0;
+    }
+
     bool Jump::getDead(PlayerInfo* player) const
     {