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

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

@@ -49 +49 @@
         RegisterObject(JumpRocket);
 
-        fuel_ = 3.0;
+        initialFuel_ = 3.0;
+        fuel_ = initialFuel_;
         attachedToFigure_ = false;
 
@@ -99 +100 @@
         attachedToFigure_ = figure_->StartRocket(this);
     }
+
+    float JumpRocket::getFuelState()
+    {
+        return fuel_/initialFuel_;
+    }
 }