From 46e8b1404ad35bf38fe8272e48aa193b1003214d Mon Sep 17 00:00:00 2001 From: Eric Oden Date: Sat, 23 Nov 2013 09:04:49 -0600 Subject: [PATCH 1/2] Various casting to double. --- BindingsFlightStats.cs | 4 ++-- BindingsUniverse.cs | 2 +- BodyTarget.cs | 2 +- VesselTarget.cs | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BindingsFlightStats.cs b/BindingsFlightStats.cs index a12f6b4..0107bc4 100644 --- a/BindingsFlightStats.cs +++ b/BindingsFlightStats.cs @@ -13,7 +13,7 @@ public class BindingsFlightStats : Binding { public override void AddTo(BindingManager manager) { - manager.AddGetter("ALT:RADAR", delegate(CPU cpu) { return cpu.Vessel.heightFromTerrain > 0 ? Mathf.Min(cpu.Vessel.heightFromTerrain, (float)cpu.Vessel.altitude) : (float)cpu.Vessel.altitude; }); + manager.AddGetter("ALT:RADAR", delegate(CPU cpu) { return cpu.Vessel.heightFromTerrain > 0 ? Math.Min(cpu.Vessel.heightFromTerrain, cpu.Vessel.altitude) : cpu.Vessel.altitude; }); manager.AddGetter("ALT:APOAPSIS", delegate(CPU cpu) { return cpu.Vessel.orbit.ApA; }); manager.AddGetter("ALT:PERIAPSIS", delegate(CPU cpu) { return cpu.Vessel.orbit.PeA; }); manager.AddGetter("ETA:APOAPSIS", delegate(CPU cpu) { return cpu.Vessel.orbit.timeToAp; }); @@ -24,7 +24,7 @@ public override void AddTo(BindingManager manager) manager.AddGetter("STATUS", delegate(CPU cpu) { return cpu.Vessel.situation.ToString().Replace("_", " "); }); manager.AddGetter("COMMRANGE", delegate(CPU cpu) { return VesselUtils.GetCommRange(cpu.Vessel); }); - manager.AddGetter("INCOMMRANGE", delegate(CPU cpu) { return Convert.ToDouble(CheckCommRange(cpu.Vessel)); }); + manager.AddGetter("INCOMMRANGE", delegate(CPU cpu) { return CheckCommRange(cpu.Vessel); }); manager.AddGetter("AV", delegate(CPU cpu) { return cpu.Vessel.transform.InverseTransformDirection(cpu.Vessel.rigidbody.angularVelocity); }); manager.AddGetter("STAGE", delegate(CPU cpu) { return new StageValues(cpu.Vessel); }); diff --git a/BindingsUniverse.cs b/BindingsUniverse.cs index 2c814dc..9897eff 100644 --- a/BindingsUniverse.cs +++ b/BindingsUniverse.cs @@ -10,7 +10,7 @@ public class BindingTimeWarp : Binding { public override void AddTo(BindingManager manager) { - manager.AddGetter("WARP", delegate(CPU cpu) { return TimeWarp.fetch.current_rate_index; }); + manager.AddGetter("WARP", delegate(CPU cpu) { return (double)TimeWarp.fetch.current_rate_index; }); manager.AddSetter("WARP", delegate(CPU cpu, object val) { int newRate; diff --git a/BodyTarget.cs b/BodyTarget.cs index 5e90544..01e7456 100644 --- a/BodyTarget.cs +++ b/BodyTarget.cs @@ -35,7 +35,7 @@ public override object GetSuffix(string suffixName) if (suffixName == "APOAPSIS") return target.orbit.ApA; if (suffixName == "PERIAPSIS") return target.orbit.PeA; if (suffixName == "VELOCITY") return new Vector(target.orbit.GetVel()); - if (suffixName == "DISTANCE") return (float)GetDistance(); + if (suffixName == "DISTANCE") return GetDistance(); if (suffixName == "BODY") return new BodyTarget(target.orbit.referenceBody, context); return base.GetSuffix(suffixName); diff --git a/VesselTarget.cs b/VesselTarget.cs index f53e01f..3520bb3 100644 --- a/VesselTarget.cs +++ b/VesselTarget.cs @@ -77,9 +77,9 @@ public override object GetSuffix(string suffixName) return new Direction(vector, false); } - if (suffixName == "DISTANCE") return (float)GetDistance(); - if (suffixName == "BEARING") return VesselUtils.GetTargetBearing(context.Vessel, target); - if (suffixName == "HEADING") return VesselUtils.GetTargetHeading(context.Vessel, target); + if (suffixName == "DISTANCE") return GetDistance(); + if (suffixName == "BEARING") return (double)VesselUtils.GetTargetBearing(context.Vessel, target); + if (suffixName == "HEADING") return (double)VesselUtils.GetTargetHeading(context.Vessel, target); if (suffixName == "PROGRADE") return GetPrograde(); if (suffixName == "RETROGRADE") return GetRetrograde(); if (suffixName == "MAXTHRUST") return VesselUtils.GetMaxThrust(target); @@ -93,7 +93,7 @@ public override object GetSuffix(string suffixName) if (suffixName == "BODY") return target.mainBody.bodyName; if (suffixName == "ANGULARMOMENTUM") return new Direction(target.angularMomentum, true); if (suffixName == "ANGULARVEL") return new Direction(target.angularVelocity, true); - if (suffixName == "MASS") return target.GetTotalMass(); + if (suffixName == "MASS") return (double)target.GetTotalMass(); if (suffixName == "VERTICALSPEED") return target.verticalSpeed; if (suffixName == "SURFACESPEED") return target.horizontalSrfSpeed; if (suffixName == "AIRSPEED") return (target.orbit.GetVel() - FlightGlobals.currentMainBody.getRFrmVel(target.GetWorldPos3D())).magnitude; //the velocity of the vessel relative to the air); From d1d1df088fa4143c4072b1e87552e1391c66180e Mon Sep 17 00:00:00 2001 From: Eric Oden Date: Mon, 25 Nov 2013 13:13:27 -0600 Subject: [PATCH 2/2] Cast SessionTime to double. --- BindingsTerminalSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BindingsTerminalSettings.cs b/BindingsTerminalSettings.cs index bfafee5..5d64196 100644 --- a/BindingsTerminalSettings.cs +++ b/BindingsTerminalSettings.cs @@ -10,7 +10,7 @@ public class BindingsTerminalSettings : Binding { public override void AddTo(BindingManager manager) { - manager.AddGetter("SESSIONTIME", delegate(CPU cpu) { return cpu.SessionTime; }); + manager.AddGetter("SESSIONTIME", delegate(CPU cpu) { return (double)cpu.SessionTime; }); manager.AddGetter("VERSION", delegate(CPU cpu) { return Core.VersionInfo; }); } }