Move Time.Update() back, use GetTime() to get real-world time when not ingame AscensionGameDev#2566

Author: pandinocoder

Intersect.Client.Core/Core/Main.cs

@@ -98,8 +98,6 @@ public static void Update(TimeSpan deltaTime)
             Globals.InputManager.Update(deltaTime);
             Audio.Update();
 
-            Time.Update();
-
             Globals.OnGameUpdate(deltaTime);
         }
     }
@@ -269,6 +267,7 @@ private static void ProcessGame()
         }
 
         Graphics.UpdatePlayerLight();
+        Time.Update();
     }
 
     public static void JoinGame()

Intersect.Client.Core/General/Time.cs

@@ -29,12 +29,6 @@ public static void LoadTime(DateTime timeUpdate, Color clr, float rate)
 
     public static void Update()
     {
-        if (!Networking.Network.IsConnected)
-        {
-            sServerTime = DateTime.Now;
-            return;
-        }
-
         if (sUpdateTime < Timing.Global.Milliseconds)
         {
             var ts = new TimeSpan(0, 0, 0, 0, (int) (1000 * sRate));
@@ -85,7 +79,12 @@ private static float LerpVal(float val, float target, float amt)
 
     public static string GetTime()
     {
-        return sServerTime.ToString("h:mm:ss tt");
+        var time = sServerTime;
+        if (Globals.GameState != GameStates.InGame)
+        {
+            time = DateTime.Now;
+        }
+        return time.ToString("h:mm:ss tt");
     }
 
     public static ColorF GetTintColor()