From 23659aabeb844ed7d05a6dc68a7b89ef1132a8c2 Mon Sep 17 00:00:00 2001 From: Aelfhe1m Date: Sun, 24 Dec 2017 16:35:55 +0000 Subject: [PATCH] Use default dateTimeFormatter for time remaining display To help support non-standard day/year lengths from custom planet packs or system rescales, prefer use of KSPUtil.dateTimeFormatter. --- AlternateResourcePanel/SharedStuff/Drawing.cs | 34 +------------------ 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/AlternateResourcePanel/SharedStuff/Drawing.cs b/AlternateResourcePanel/SharedStuff/Drawing.cs index 1f661ac..2a9d613 100644 --- a/AlternateResourcePanel/SharedStuff/Drawing.cs +++ b/AlternateResourcePanel/SharedStuff/Drawing.cs @@ -267,39 +267,7 @@ internal static void DrawTimeRemaining(Rect rectStart, ARPResource Res) internal static String FormatTime(Double TimeInSecs) { - String strReturn = ""; - - Double Second = TimeInSecs % 60; - Double Minute = Math.Truncate((TimeInSecs / 60) % 60); - Double HourRaw = TimeInSecs / 60 / 60; - - Double Hour; - if (GameSettings.KERBIN_TIME) - Hour = Math.Truncate(HourRaw % 6); - else - Hour = Math.Truncate(HourRaw % 24); - - Double Day; - if (GameSettings.KERBIN_TIME) - Day = Math.Truncate((HourRaw % (426 * 6)) / 6); - else - Day = Math.Truncate((HourRaw % (365 * 24)) / 24); - - Double Year; - if (GameSettings.KERBIN_TIME) - Year = Math.Truncate((HourRaw / (426 * 6))); - else - Year = Math.Truncate((HourRaw / (365 * 24))); - - if (Year > 0) - strReturn = String.Format("{0:0}y {1:0}d {2:00}:{3:00}:{4:00}", Year, Day, Hour, Minute, Second); - else if (Day > 0) - strReturn = String.Format("{0:0}d {1:00}:{2:00}:{3:00}", Day, Hour, Minute, Second); - else if (Hour > 0) - strReturn = String.Format("{1:0}:{2:00}:{3:00}", Day, Hour, Minute, Second); - else - strReturn = String.Format("{2:0}:{3:00.0}", Day, Hour, Minute, Second); - return strReturn; + return KSPUtil.dateTimeFormatter.PrintDateDeltaCompact(TimeInSecs, true, true, true); }