Improved load removal

Author: ShootMe

Components/LiveSplit.OriWotW.dll

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <updates>
+    <update version="1.1.7">
+        <files>
+            <file path="Components/LiveSplit.OriWotW.dll" status="changed"/>
+        </files>
+        <changelog>
+            <change> Improved Load Removal </change>
+        </changelog>
+    </update>
     <update version="1.1.6">
         <files>
             <file path="Components/LiveSplit.OriWotW.dll" status="changed"/>

Components/Updates.xml

@@ -1,19 +1,40 @@
 using System.Diagnostics;
 namespace LiveSplit.OriWotW {
     public class FPSTimer {
+        private const long AveTimeTicks = 10000000;
+        private const long ShortTimeTicks = 1000000;
         public float FPS = 0;
+        public float FPSShort = 0;
         private Stopwatch frameTimer;
         private int lastFrameCount = 0;
-
+        private int lastFrameShort = 0;
+        private long lastTicks = 0;
+        private long lastTicksShort = 0;
         public FPSTimer() {
             frameTimer = new Stopwatch();
             frameTimer.Start();
         }
+        public void Reset() {
+            lastTicksShort = 0;
+            lastTicks = 0;
+            lastFrameCount = 0;
+            lastFrameShort = 0;
+        }
         public void Update(int frameCount) {
-            if (frameTimer.ElapsedTicks >= 5000000) {
-                FPS = (float)((double)10000000 * (double)(frameCount - lastFrameCount) / (double)frameTimer.ElapsedTicks);
-                frameTimer.Restart();
+            long ticks = frameTimer.ElapsedTicks;
+            if (ticks >= lastTicks) {
+                if (lastFrameCount > 0) {
+                    FPS = (float)((double)10000000 * (double)(frameCount - lastFrameCount) / (double)(ticks - lastTicks + AveTimeTicks));
+                }
                 lastFrameCount = frameCount;
+                lastTicks = ticks + AveTimeTicks;
+            }
+            if (ticks >= lastTicksShort) {
+                if (lastFrameShort > 0) {
+                    FPSShort = (float)((double)10000000 * (double)(frameCount - lastFrameShort) / (double)(ticks - lastTicksShort + ShortTimeTicks));
+                }
+                lastFrameShort = frameCount;
+                lastTicksShort = ticks + ShortTimeTicks;
             }
         }
     }

Memory/FPSTimer.cs

@@ -78,7 +78,8 @@ public string GamePointers() {
                 $"SM: {ScenesManager.GetPointer(Program)} ",
                 $"USC: {UberStateController.GetPointer(Program)} ",
                 $"USL: {UberStateCollection.GetPointer(Program)} ",
-                $"DC: {DifficultyController.GetPointer(Program)} "
+                $"DC: {DifficultyController.GetPointer(Program)} ",
+                $"FC: {FrameCounter.GetPointer(Program)} "
             );
         }
         public string Patches() {
@@ -113,8 +114,8 @@ public void PatchTargetFrameRate(bool patch) {
         public int FrameCount() {
             return FrameCounter.Read<int>(Program, 0xb8, 0x0);
         }
-        public float FPS() {
-            return (float)fpsTimer.FPS;
+        public string FPS() {
+            return $"{fpsTimer.FPS:0.0}";
         }
         public int Difficulty() {
             //DifficultyController.Instance.Difficulty
@@ -441,7 +442,7 @@ public Screen TitleScreen() {
         }
         public bool IsLoadingGame() {
             //GameController.FreezeFixedUpdate || GameController.Instance.m_isLoadingGame
-            return GameController.Read<bool>(Program, 0xb8, 0xa) || GameController.Read<bool>(Program, 0xb8, 0x0, 0x103);
+            return fpsTimer.FPSShort == 0 || GameController.Read<bool>(Program, 0xb8, 0xa) || GameController.Read<bool>(Program, 0xb8, 0x0, 0x103);
         }
         public bool HookProcess() {
             IsHooked = Program != null && !Program.HasExited;
@@ -467,11 +468,14 @@ public bool HookProcess() {
                     noPausePatched = null;
                     targetFrameRatePatched = null;
                     IsHooked = true;
+                    fpsTimer.Reset();
                 }
             }
 
             if (IsHooked) {
                 fpsTimer.Update(FrameCount());
+            } else {
+                fpsTimer.Update(1);
             }
             return IsHooked;
         }

Memory/MemoryManager.cs

@@ -14,6 +14,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("b3294e28-2bd4-4e39-92fa-e04a620c737f")]
-[assembly: AssemblyVersion("1.1.6.0")]
-[assembly: AssemblyFileVersion("1.1.6.0")]
+[assembly: AssemblyVersion("1.1.7.0")]
+[assembly: AssemblyFileVersion("1.1.7.0")]
 [assembly: ComponentFactory(typeof(Factory))]

Properties/AssemblyInfo.cs

@@ -153,7 +153,7 @@ public void Update(IInvalidator invalidator, LiveSplitState lvstate, float width
             }
 
             if (infoComponent != null) {
-                string fps = logic.Memory.FPS().ToString("0.0");
+                string fps = logic.Memory.FPS();
                 if (fps != infoComponent.Settings.Text2) {
                     infoComponent.Settings.Text2 = fps;
                 }