time initialize before the first update

Eddio0141 · Aug 20, 2023 · 0faa91c · 0faa91c
1 parent 0a9e375
commit 0faa91c
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/UniTAS/Patcher/Implementations/VirtualEnvironment/TimeEnv.cs b/UniTAS/Patcher/Implementations/VirtualEnvironment/TimeEnv.cs
@@ -3,6 +3,7 @@
 using HarmonyLib;
 using UniTAS.Patcher.Interfaces.DependencyInjection;
 using UniTAS.Patcher.Interfaces.Events.MonoBehaviourEvents.DontRunIfPaused;
+using UniTAS.Patcher.Interfaces.Events.MonoBehaviourEvents.RunEvenPaused;
 using UniTAS.Patcher.Interfaces.Events.SoftRestart;
 using UniTAS.Patcher.Models.DependencyInjection;
 using UniTAS.Patcher.Services;
@@ -15,7 +16,7 @@ namespace UniTAS.Patcher.Implementations.VirtualEnvironment;
 [Singleton(RegisterPriority.TimeEnv)]
 [ExcludeRegisterIfTesting]
 public class TimeEnv : ITimeEnv, IOnPreUpdatesActual, IOnGameRestartResume, IOnStartActual, IOnLastUpdateActual,
-    IOnFixedUpdateActual
+    IOnFixedUpdateActual, IOnUpdateUnconditional
 {
     private readonly ConfigEntry<float> _defaultFps;
 
@@ -36,15 +37,23 @@ public TimeEnv(IConfig config, ITimeWrapper timeWrap, IPatchReverseInvoker patch
 
         _timeWrap = timeWrap;
 
+        FrameTime = 0f;
+        TimeTolerance = _timeWrap.IntFPSOnly ? 1.0 / int.MaxValue : float.Epsilon;
+    }
+
+    private bool _initialTimeSet;
+
+    public void UpdateUnconditional()
+    {
+        if (_initialTimeSet) return;
+        _initialTimeSet = true;
+
         // stupid but slightly fixes accuracy on game first start
         var initialFt = 1.0 / _defaultFps.Value;
         RealtimeSinceStartup += initialFt;
         UnscaledTime += initialFt;
-        ScaledTime += initialFt;
+        ScaledTime += initialFt * Time.timeScale;
         SecondsSinceStartUp += initialFt;
-
-        FrameTime = 0f;
-        TimeTolerance = _timeWrap.IntFPSOnly ? 1.0 / int.MaxValue : float.Epsilon;
     }
 
     public double TimeTolerance { get; }