Changeset 10260 for code/trunk/src/modules/jump/JumpPropeller.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/JumpPropeller.cc (modified) (2 diffs)

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

@@ -52 +52 @@
         RegisterObject(JumpPropeller);
 
-        fuel_ = 3.0;
+        initialFuel_ = 3.0;
+        fuel_ = initialFuel_;
         attachedToFigure_ = false;
 
@@ -106 +107 @@
         }
     }
+
+    float JumpPropeller::getFuelState()
+    {
+        return fuel_/initialFuel_;
+    }
 }