Division by Zero on a ManeuverCommand - fixes RemoteTechnologiesGroup#65

Peppie84 · Warren Seymour · commit 8d4ef7fa3cb5 · 2014-06-01T22:47:39.000+01:00
The Maneuver is now on hold until you ativate the engine. A short message will be displayed: http://peppie23.imgur.com/all/
diff --git a/src/RemoteTech2/FlightComputer/Commands/ManeuverCommand.cs b/src/RemoteTech2/FlightComputer/Commands/ManeuverCommand.cs
@@ -12,15 +12,27 @@ public class ManeuverCommand : AbstractCommand
         public double OriginalDelta { get; set; }
         public double RemainingTime { get; set; }
         public double RemainingDelta { get; set; }
+        public bool EngineActivated { get; set; }
         public override int Priority { get { return 0; } }
 
         public override string Description
         {
             get
             {
                 if (RemainingTime > 0 || RemainingDelta > 0)
-                    return "Executing maneuver: " + RemainingDelta.ToString("F2") + "m/s" + Environment.NewLine +
-                           "Remaining duration: " + RTUtil.FormatDuration(RemainingTime) + Environment.NewLine + base.Description;
+                {
+                    string flightInfo = "Executing maneuver: " + RemainingDelta.ToString("F2") +
+                                        "m/s" + Environment.NewLine + "Remaining duration: ";
+
+                    if (EngineActivated)
+                    {
+                        flightInfo += RTUtil.FormatDuration(RemainingTime);
+                    }
+                    else
+                        flightInfo += "-:-";
+
+                    return flightInfo + Environment.NewLine + base.Description;
+                }
                 else
                     return "Execute planned maneuver" + Environment.NewLine + base.Description;
             }
@@ -32,7 +44,17 @@ public override bool Pop(FlightComputer f)
             if (burn != null) f.Remove(burn);
             OriginalDelta = Node.DeltaV.magnitude;
             RemainingDelta = Node.GetBurnVector(f.Vessel.orbit).magnitude;
-            RemainingTime = RemainingDelta / (FlightCore.GetTotalThrust(f.Vessel) / f.Vessel.GetTotalMass());
+            EngineActivated = true;
+            double thrustToMass = (FlightCore.GetTotalThrust(f.Vessel) / f.Vessel.GetTotalMass());
+
+            if (thrustToMass != 0.0)
+                RemainingTime = RemainingDelta / thrustToMass;
+            else
+            {
+                EngineActivated = false;
+                RTUtil.ScreenMessage("[Flight Computer]: No Engine to proceed the maneuver.");
+            }
+
             return true;
         }
 
@@ -44,9 +66,19 @@ public override bool Execute(FlightComputer f, FlightCtrlState fcs)
                 var up = (f.SignalProcessor.Body.position - f.SignalProcessor.Position).normalized;
                 var orientation = Quaternion.LookRotation(forward, up);
                 FlightCore.HoldOrientation(fcs, f, orientation);
+
+                double thrustToMass = (FlightCore.GetTotalThrust(f.Vessel) / f.Vessel.GetTotalMass());
+
+                if (thrustToMass == 0.0)
+                {
+                    EngineActivated = false;
+                    return false;
+                }
+
+                EngineActivated = true;
                 fcs.mainThrottle = 1.0f;
-                RemainingTime -= TimeWarp.deltaTime;
-                RemainingDelta -= (FlightCore.GetTotalThrust(f.Vessel) / f.Vessel.GetTotalMass()) * TimeWarp.deltaTime;
+                RemainingTime = RemainingDelta / thrustToMass;
+                RemainingDelta -= thrustToMass * TimeWarp.deltaTime;
                 return false;
             }
             f.Enqueue(AttitudeCommand.Off(), true, true, true);
