From 70ec7f9276c9c0f020dcce5ee84845d9c9f80670 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Sun, 14 Aug 2022 14:11:14 -0700 Subject: [PATCH] use WakeUpSync.GetSecondsElapsed --- QSB/TimeSync/TimeSyncUI.cs | 6 +++--- QSB/TimeSync/WakeUpSync.cs | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/QSB/TimeSync/TimeSyncUI.cs b/QSB/TimeSync/TimeSyncUI.cs index 46706b1e..fa479f8a 100644 --- a/QSB/TimeSync/TimeSyncUI.cs +++ b/QSB/TimeSync/TimeSyncUI.cs @@ -63,7 +63,7 @@ internal class TimeSyncUI : MonoBehaviour, IAddComponentOnStart _currentType = type; _currentReason = reason; - _startTime = Time.timeSinceLevelLoad; + _startTime = WakeUpSync.GetSecondsElapsed(); enabled = true; _canvas.enabled = true; Canvas.willRenderCanvases += OnWillRenderCanvases; @@ -91,7 +91,7 @@ internal class TimeSyncUI : MonoBehaviour, IAddComponentOnStart switch ((FastForwardReason)_currentReason) { case FastForwardReason.TooFarBehind: - var totalSeconds = Mathf.Max(TargetTime - Time.timeSinceLevelLoad, 0f); + var totalSeconds = Mathf.Max(TargetTime - WakeUpSync.GetSecondsElapsed(), 0f); var minutes = Mathf.FloorToInt(totalSeconds / 60f); var seconds = Mathf.FloorToInt(totalSeconds) % 60; var milliseconds = totalSeconds % 1 * 1000; @@ -109,7 +109,7 @@ internal class TimeSyncUI : MonoBehaviour, IAddComponentOnStart break; case PauseReason.TooFarAhead: - var totalSeconds = Mathf.Max(Time.timeSinceLevelLoad - TargetTime, 0f); + var totalSeconds = Mathf.Max(WakeUpSync.GetSecondsElapsed() - TargetTime, 0f); var minutes = Mathf.FloorToInt(totalSeconds / 60f); var seconds = Mathf.FloorToInt(totalSeconds) % 60; var milliseconds = totalSeconds % 1 * 1000; diff --git a/QSB/TimeSync/WakeUpSync.cs b/QSB/TimeSync/WakeUpSync.cs index 22026530..8b166193 100644 --- a/QSB/TimeSync/WakeUpSync.cs +++ b/QSB/TimeSync/WakeUpSync.cs @@ -78,7 +78,7 @@ public class WakeUpSync : NetworkBehaviour public float GetTimeDifference() { - var myTime = Time.timeSinceLevelLoad; + var myTime = GetSecondsElapsed(); return myTime - _serverTime; } @@ -165,7 +165,7 @@ public class WakeUpSync : NetworkBehaviour return; } - var myTime = Time.timeSinceLevelLoad; + var myTime = GetSecondsElapsed(); var diff = myTime - _serverTime; if (ServerStateManager.Instance.GetServerState() is not (ServerState.InSolarSystem or ServerState.InEye)) @@ -199,7 +199,7 @@ public class WakeUpSync : NetworkBehaviour return; } - DebugLog.DebugWrite($"START FASTFORWARD (Target:{_serverTime} Current:{Time.timeSinceLevelLoad})", MessageType.Info); + DebugLog.DebugWrite($"START FASTFORWARD (Target:{_serverTime} Current:{GetSecondsElapsed()})", MessageType.Info); if (Locator.GetActiveCamera() != null) { Locator.GetActiveCamera().enabled = false; @@ -224,7 +224,7 @@ public class WakeUpSync : NetworkBehaviour return; } - DebugLog.DebugWrite($"START PAUSING (Target:{_serverTime} Current:{Time.timeSinceLevelLoad})", MessageType.Info); + DebugLog.DebugWrite($"START PAUSING (Target:{_serverTime} Current:{GetSecondsElapsed()})", MessageType.Info); Locator.GetActiveCamera().enabled = false; //OWInput.ChangeInputMode(InputMode.None); @@ -279,7 +279,7 @@ public class WakeUpSync : NetworkBehaviour private void UpdateServer() { - _serverTime = Time.timeSinceLevelLoad; + _serverTime = GetSecondsElapsed(); if (ServerStateManager.Instance == null) { @@ -353,7 +353,7 @@ public class WakeUpSync : NetworkBehaviour Locator.GetPlayerCamera().enabled = false; } - var diff = _serverTime - Time.timeSinceLevelLoad; + var diff = _serverTime - GetSecondsElapsed(); OWTime.SetTimeScale(Mathf.SmoothStep(MinFastForwardSpeed, MaxFastForwardSpeed, Mathf.Abs(diff) / MaxFastForwardDiff)); TimeSyncUI.TargetTime = _serverTime; @@ -412,7 +412,7 @@ public class WakeUpSync : NetworkBehaviour if (CurrentState == State.Pausing && (PauseReason)CurrentReason == PauseReason.TooFarAhead) { - if (Time.timeSinceLevelLoad <= _serverTime) + if (GetSecondsElapsed() <= _serverTime) { ResetTimeScale(); } @@ -420,7 +420,7 @@ public class WakeUpSync : NetworkBehaviour if (CurrentState == State.FastForwarding && (FastForwardReason)CurrentReason == FastForwardReason.TooFarBehind) { - if (Time.timeSinceLevelLoad >= _serverTime) + if (GetSecondsElapsed() >= _serverTime) { ResetTimeScale(); }