Major overhaul to Timing and other fixes

- Overhaul to timing methods to increase timing accuracies and fix issues related to pause spamming - Fixed double splitting in HL2 Survivor - Added an option to disable pausing timer when starting from game pause - Code cleanups and refactoring
thisis2838 · Jan 1, 2022 · 6f77602 · 6f77602
1 parent b3b617f
commit 6f77602
Show file tree

Hide file tree

Showing 52 changed files with 596 additions and 310 deletions.
diff --git a/Extensions/Detour.cs b/Extensions/Detour.cs
@@ -0,0 +1,58 @@
+using LiveSplit.ComponentUtil;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LiveSplit.SourceSplit.Extensions
+{
+    public class ByteReplacement
+    {
+        private byte[] _old;
+        private int _count;
+        private IntPtr _address;
+        Process _process;
+
+        public ByteReplacement(Process p, IntPtr address, int count)
+        {
+            _address = address;
+            _process = p;
+            _count = count;
+            _old = p.ReadBytes(_address, _count);
+        }
+
+        public void Replace(byte[] newBytes)
+        {
+            Trace.Assert(newBytes.Length == _count);
+            _process.WriteBytes(_address, newBytes);
+        }
+
+        public void Restore()
+        {
+            _process.WriteBytes(_address, _old);
+        }
+    }
+    public class Detour
+    {
+        private ByteReplacement _replaced;
+
+        public Detour(Process p, IntPtr from, IntPtr to, int preserve, byte[] newBytes, bool preserveAfter = false)
+        {
+            _replaced = new ByteReplacement(p, from, preserve);
+
+            p.WriteBytes(to + (preserveAfter ? newBytes.Length : 0), p.ReadBytes(from, preserve));
+            p.WriteJumpInstruction(from, to);
+            p.WriteBytes(to + (preserveAfter ? 0 : preserve), newBytes);
+
+            p.WriteJumpInstruction(to + preserve + newBytes.Length, from + preserve);
+            Debug.WriteLine($"Written detour from 0x{from.ToString("X")} to 0x{to.ToString("X")} [{newBytes.Length} bytes]");
+        }
+
+        public void Restore()
+        {
+            _replaced.Restore();
+        }
+    }
+}
diff --git a/GameMemory.cs b/GameMemory.cs
diff --git a/GameSpecific/ApertureTag.cs b/GameSpecific/ApertureTag.cs
@@ -46,7 +46,7 @@ public override GameSupportResult OnUpdate(GameState state)
             if (this.IsFirstMap)
             {
                 // first tick player out of shower
-                if (state.PlayerPosition.Distance(_startPos) < 1.0f)
+                if (state.PlayerPosition.Current.Distance(_startPos) < 1.0f)
                 {
                     Debug.WriteLine("aperture tag start");
                     _onceFlag = true;

diff --git a/GameSpecific/BMSRetail.cs b/GameSpecific/BMSRetail.cs
@@ -131,12 +131,12 @@ public override GameSupportResult OnUpdate(GameState state)
             }
             else if (_ebEndCommand.BValue && state.CurrentMap.ToLower() == _ebEndMap)
             {
-                if (state.PlayerViewEntityIndex == _ebCamIndex && state.PrevPlayerViewEntityIndex == 1)
+                if (state.PlayerViewEntityIndex.Current == _ebCamIndex && state.PlayerViewEntityIndex.Old == 1)
                     return DefaultEnd("bms eb end");
             }
             else if ((_xenStartCommand.BValue || _xenSplitCommand.BValue) && state.CurrentMap.ToLower() == _xenStartMap)
             {
-                if (state.PlayerViewEntityIndex == 1 && state.PrevPlayerViewEntityIndex == _xenCamIndex)
+                if (state.PlayerViewEntityIndex.Current == 1 && state.PlayerViewEntityIndex.Old == _xenCamIndex)
                 {
                     _onceFlag = true;
                     Debug.WriteLine("bms xen start");

diff --git a/GameSpecific/GameSupport.cs b/GameSpecific/GameSupport.cs
@@ -145,24 +145,24 @@ public virtual GameSupportResult OnUpdate(GameState state)
                 return GameSupportResult.DoNothing;
 
             if (this.AutoStartType == AutoStart.Unfrozen
-                && !state.PlayerFlags.HasFlag(FL.FROZEN)
-                && state.PrevPlayerFlags.HasFlag(FL.FROZEN))
+                && !state.PlayerFlags.Current.HasFlag(FL.FROZEN)
+                && state.PlayerFlags.Old.HasFlag(FL.FROZEN))
             {
                 Debug.WriteLine("FL_FROZEN removed from player");
                 _onceFlag = true;
                 return GameSupportResult.PlayerGainedControl;
             }
             else if (this.AutoStartType == AutoStart.ViewEntityChanged
-                && state.PrevPlayerViewEntityIndex != GameState.ENT_INDEX_PLAYER
-                && state.PlayerViewEntityIndex == GameState.ENT_INDEX_PLAYER)
+                && state.PlayerViewEntityIndex.Old != GameState.ENT_INDEX_PLAYER
+                && state.PlayerViewEntityIndex.Current == GameState.ENT_INDEX_PLAYER)
             {
                 Debug.WriteLine("view entity changed to player");
                 _onceFlag = true;
                 return GameSupportResult.PlayerGainedControl;
             }
             else if (this.AutoStartType == AutoStart.ParentEntityChanged
-                && state.PrevPlayerParentEntityHandle != -1
-                && state.PlayerParentEntityHandle == -1)
+                && state.PlayerParentEntityHandle.Old != -1
+                && state.PlayerParentEntityHandle.Current == -1)
             {
                 Debug.WriteLine("player no longer parented");
                 _onceFlag = true;

diff --git a/GameSpecific/HDTF.cs b/GameSpecific/HDTF.cs
@@ -91,12 +91,12 @@ public override GameSupportResult OnUpdate(GameState state)
             if (_onceFlag)
                 return GameSupportResult.DoNothing;
 
-            if (state.CurrentMap.ToLower() == "a0c0p1" && state.PlayerPosition.DistanceXY(_startPos) <= 3f)
+            if (state.CurrentMap.ToLower() == "a0c0p1" && state.PlayerPosition.Current.DistanceXY(_startPos) <= 3f)
             {
                 bool ifIntroNotDeleted = File.Exists(state.GameProcess.ReadString(state.GameOffsets.GameDirPtr, 255) + "/media/a0b0c0s0.bik");
                 if (_tutResetFlag && 
                     (ifIntroNotDeleted && _isInCutscene.Current - _isInCutscene.Old == -1) ^ 
-                    (!ifIntroNotDeleted && !_resetFlag && state.TickCount <= 1 && state.RawTickCount <= 150))
+                    (!ifIntroNotDeleted && !_resetFlag && state.TickCount <= 1 && state.RawTickCount.Current <= 150))
                 {
                     Debug.WriteLine("hdtf start");
                     _onceFlag = true;

diff --git a/GameSpecific/HL2.cs b/GameSpecific/HL2.cs
@@ -50,7 +50,7 @@ public override GameSupportResult OnUpdate(GameState state)
                 // "OnTrigger" "point_teleport_destination,Teleport,,0.1,-1"
 
                 // first tick player is moveable and on the train
-                if (state.PlayerPosition.DistanceXY(_startPos) <= 1.0)
+                if (state.PlayerPosition.Current.DistanceXY(_startPos) <= 1.0)
                 {
                     Debug.WriteLine("hl2 start");
                     _onceFlag = true;

diff --git a/GameSpecific/HL2Ep2.cs b/GameSpecific/HL2Ep2.cs
@@ -76,8 +76,8 @@ public override GameSupportResult OnUpdate(GameState state)
             {
                 // "OnTrigger4" "cvehicle.hangar,EnterVehicle,,0,1"
 
-                if (state.PlayerParentEntityHandle != -1
-                    && state.PrevPlayerParentEntityHandle == -1)
+                if (state.PlayerParentEntityHandle.Current != -1
+                    && state.PlayerParentEntityHandle.Old == -1)
                 {
                     Debug.WriteLine("ep2 end");
                     _onceFlag = true;

diff --git a/GameSpecific/HL2Mods/HL2Mods_1187Ep1.cs b/GameSpecific/HL2Mods/HL2Mods_1187Ep1.cs
@@ -91,7 +91,7 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (IsFirstMap)
             {
-                if (state.PrevPlayerViewEntityIndex == _startCamIndex && state.PlayerViewEntityIndex == 1)
+                if (state.PlayerViewEntityIndex.Old == _startCamIndex && state.PlayerViewEntityIndex.Current == 1)
                 {
                     Debug.WriteLine("1187ep1 start");
                     _onceFlag = true;

diff --git a/GameSpecific/HL2Mods/HL2Mods_Crates.cs b/GameSpecific/HL2Mods/HL2Mods_Crates.cs
@@ -44,7 +44,7 @@ public override GameSupportResult OnUpdate(GameState state)
             if (this.IsFirstMap)
             {
                 _counterSkin.Update(state.GameProcess);
-                if (_counterSkin.Current == 10 && state.PlayerViewEntityIndex == _camIndex && state.PrevPlayerViewEntityIndex == 1)
+                if (_counterSkin.Current == 10 && state.PlayerViewEntityIndex.Current == _camIndex && state.PlayerViewEntityIndex.Old == 1)
                 {
                     _onceFlag = true;
                     Debug.WriteLine("toomanycrates end");

diff --git a/GameSpecific/HL2Mods/HL2Mods_DaBaby.cs b/GameSpecific/HL2Mods/HL2Mods_DaBaby.cs
@@ -40,7 +40,7 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (_startCamIndex != -1)
             {
-                if (state.PlayerViewEntityIndex == 1 && state.PrevPlayerViewEntityIndex == _startCamIndex)
+                if (state.PlayerViewEntityIndex.Current == 1 && state.PlayerViewEntityIndex.Old == _startCamIndex)
                 {
                     Debug.WriteLine("da baby start");
                     return GameSupportResult.PlayerGainedControl;
@@ -49,7 +49,7 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (_endingCamIndex != -1)
             {
-                if (state.PlayerViewEntityIndex == _endingCamIndex && state.PrevPlayerViewEntityIndex == 1)
+                if (state.PlayerViewEntityIndex.Current == _endingCamIndex && state.PlayerViewEntityIndex.Old == 1)
                 {
                     Debug.WriteLine("da baby end");
                     _onceFlag = true;

diff --git a/GameSpecific/HL2Mods/HL2Mods_DayHard.cs b/GameSpecific/HL2Mods/HL2Mods_DayHard.cs
@@ -46,8 +46,8 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (this.IsFirstMap && _camIndex != -1)
             {
-                if (state.PlayerViewEntityIndex == 1 &&
-                    state.PrevPlayerViewEntityIndex == _camIndex)
+                if (state.PlayerViewEntityIndex.Current == 1 &&
+                    state.PlayerViewEntityIndex.Old == _camIndex)
                 {
                     Debug.WriteLine("DayHard start");
                     _onceFlag = true;

diff --git a/GameSpecific/HL2Mods/HL2Mods_DeeperDown.cs b/GameSpecific/HL2Mods/HL2Mods_DeeperDown.cs
@@ -47,7 +47,7 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (this.IsFirstMap)
             {
-                if (state.PlayerViewEntityIndex == 1 && state.PrevPlayerViewEntityIndex == _camIndex)
+                if (state.PlayerViewEntityIndex.Current == 1 && state.PlayerViewEntityIndex.Old == _camIndex)
                 {
                     _onceFlag = true;
                     Debug.WriteLine("deeper down start");

diff --git a/GameSpecific/HL2Mods/HL2Mods_Downfall.cs b/GameSpecific/HL2Mods/HL2Mods_Downfall.cs
@@ -42,8 +42,8 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (this.IsFirstMap)
             {
-                if (state.PrevPlayerViewEntityIndex != GameState.ENT_INDEX_PLAYER
-                    && state.PlayerViewEntityIndex == GameState.ENT_INDEX_PLAYER)
+                if (state.PlayerViewEntityIndex.Old != GameState.ENT_INDEX_PLAYER
+                    && state.PlayerViewEntityIndex.Current == GameState.ENT_INDEX_PLAYER)
                 {
                     Debug.WriteLine("downfall start");
                     _onceFlag = true;

diff --git a/GameSpecific/HL2Mods/HL2Mods_Exit2.cs b/GameSpecific/HL2Mods/HL2Mods_Exit2.cs
@@ -40,8 +40,8 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (this.IsFirstMap && this._camIndex != -1)
             {
-                if (state.PlayerViewEntityIndex == 1 &&
-                    state.PrevPlayerViewEntityIndex == _camIndex)
+                if (state.PlayerViewEntityIndex.Current == 1 &&
+                    state.PlayerViewEntityIndex.Old == _camIndex)
                 {
                     Debug.WriteLine("exit2 start");
                     _onceFlag = true;
@@ -50,8 +50,8 @@ public override GameSupportResult OnUpdate(GameState state)
             }
             else if (this.IsLastMap)
             {
-                if (state.PlayerViewEntityIndex == _camIndex &&
-                    state.PrevPlayerViewEntityIndex == 1)
+                if (state.PlayerViewEntityIndex.Current == _camIndex &&
+                    state.PlayerViewEntityIndex.Old == 1)
                 {
                     Debug.WriteLine("exit2 end");
                     _onceFlag = true;

diff --git a/GameSpecific/HL2Mods/HL2Mods_ExperimentalFuel.cs b/GameSpecific/HL2Mods/HL2Mods_ExperimentalFuel.cs
@@ -50,8 +50,8 @@ public override GameSupportResult OnUpdate(GameState state)
                 var newMote = state.GetEntInfoByIndex(_dustmoteIndex);
                 var newBrush = state.GetEntInfoByIndex(_blockBrushIndex);
 
-                if (state.PlayerPosition.DistanceXY(new Vector3f(7784.5f, 7284f, -15107f)) >= 2
-                    && state.PrevPlayerPosition.DistanceXY(new Vector3f(7784.5f, 7284f, -15107f)) < 2
+                if (state.PlayerPosition.Current.DistanceXY(new Vector3f(7784.5f, 7284f, -15107f)) >= 2
+                    && state.PlayerPosition.Old.DistanceXY(new Vector3f(7784.5f, 7284f, -15107f)) < 2
                     && newBrush.EntityPtr == IntPtr.Zero && !_resetFlag)
                 {
                     Debug.WriteLine("exp fuel start");

diff --git a/GameSpecific/HL2Mods/HL2Mods_Freakman2.cs b/GameSpecific/HL2Mods/HL2Mods_Freakman2.cs
@@ -61,7 +61,7 @@ public override GameSupportResult OnUpdate(GameState state)
 
             else if (this.IsLastMap && _camIndex != -1)
             {
-                if (state.PrevPlayerViewEntityIndex != _camIndex && state.PlayerViewEntityIndex == _camIndex)
+                if (state.PlayerViewEntityIndex.Old != _camIndex && state.PlayerViewEntityIndex.Current == _camIndex)
                 {
                     _onceFlag = true;
                     Debug.WriteLine("freakman2 end");

diff --git a/GameSpecific/HL2Mods/HL2Mods_GetALife.cs b/GameSpecific/HL2Mods/HL2Mods_GetALife.cs
@@ -44,7 +44,7 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (this.IsFirstMap)
             {
-                if (state.PlayerViewEntityIndex == 1 && state.PrevPlayerViewEntityIndex == _startCamIndex)
+                if (state.PlayerViewEntityIndex.Current == 1 && state.PlayerViewEntityIndex.Old == _startCamIndex)
                 {
                     _onceFlag = true;
                     Debug.WriteLine("get a life start");
@@ -53,7 +53,7 @@ public override GameSupportResult OnUpdate(GameState state)
             }
             else if (this.IsLastMap)
             {
-                if (state.PrevPlayerViewEntityIndex == 1 && state.PlayerViewEntityIndex == _endCamIndex)
+                if (state.PlayerViewEntityIndex.Old == 1 && state.PlayerViewEntityIndex.Current == _endCamIndex)
                 {
                     _onceFlag = true;
                     Debug.WriteLine("get a life end");

diff --git a/GameSpecific/HL2Mods/HL2Mods_Grey.cs b/GameSpecific/HL2Mods/HL2Mods_Grey.cs
@@ -45,7 +45,7 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (this.IsFirstMap)
             {
-                if (state.PrevPlayerViewEntityIndex == _startcamIndex && state.PlayerViewEntityIndex == 1)
+                if (state.PlayerViewEntityIndex.Old == _startcamIndex && state.PlayerViewEntityIndex.Current == 1)
                 {
                     _onceFlag = true;
                     Debug.WriteLine("grey start");
@@ -54,7 +54,7 @@ public override GameSupportResult OnUpdate(GameState state)
             }
             else if (this.IsLastMap)
             {
-                if (state.PrevPlayerViewEntityIndex == 1 && state.PlayerViewEntityIndex == _endcamIndex)
+                if (state.PlayerViewEntityIndex.Old == 1 && state.PlayerViewEntityIndex.Current == _endcamIndex)
                 {
                     _onceFlag = true;
                     Debug.WriteLine("grey end");

diff --git a/GameSpecific/HL2Mods/HL2Mods_Hangover.cs b/GameSpecific/HL2Mods/HL2Mods_Hangover.cs
@@ -40,8 +40,8 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (this.IsFirstMap)
             {
-                if (state.PrevPlayerViewEntityIndex == _startCamIndex &&
-                    state. PlayerViewEntityIndex == 1)
+                if (state.PlayerViewEntityIndex.Old == _startCamIndex &&
+                    state.PlayerViewEntityIndex.Current == 1)
                 {
                     _onceFlag = true;
                     Debug.WriteLine("hangover start");

diff --git a/GameSpecific/HL2Mods/HL2Mods_KillTheMonk.cs b/GameSpecific/HL2Mods/HL2Mods_KillTheMonk.cs
@@ -56,7 +56,7 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (this.IsFirstMap)
             {
-                if (state.PrevPlayerViewEntityIndex == _camIndex && state.PlayerViewEntityIndex == 1)
+                if (state.PlayerViewEntityIndex.Old == _camIndex && state.PlayerViewEntityIndex.Current == 1)
                 {
                     _onceFlag = true;
                     Debug.WriteLine("kill the monk start");

diff --git a/GameSpecific/HL2Mods/HL2Mods_MImp.cs b/GameSpecific/HL2Mods/HL2Mods_MImp.cs
@@ -56,7 +56,7 @@ public override GameSupportResult OnUpdate(GameState state)
             }
             else if (this.IsLastMap && _camIndex != -1)
             {
-                if (state.PlayerViewEntityIndex == _camIndex && state.PrevPlayerViewEntityIndex != _camIndex)
+                if (state.PlayerViewEntityIndex.Current == _camIndex && state.PlayerViewEntityIndex.Old != _camIndex)
                 {
                     Debug.WriteLine("mimp end");
                     _onceFlag = true;

diff --git a/GameSpecific/HL2Mods/HL2Mods_Others.cs b/GameSpecific/HL2Mods/HL2Mods_Others.cs
@@ -19,7 +19,7 @@ class HL2Mods_Misc : GameSupport
 
         public override void OnGenericUpdate(GameState state)
         {
-            if (IsLastMap && state.HostState == HostState.GameShutdown)
+            if (IsLastMap && state.HostState.Current == HostState.GameShutdown)
                 OnUpdate(state);
         }
 
@@ -175,7 +175,7 @@ public override GameSupportResult OnUpdate(GameState state)
                 return GameSupportResult.DoNothing;
 
             // todo: probably should use the helicopter's position?
-            if (IsLastMap && state.PlayerPosition.Distance(_endSector) <= 300f)
+            if (IsLastMap && state.PlayerPosition.Current.Distance(_endSector) <= 300f)
             {
                 float splitTime = state.FindOutputFireTime("game_end", 10);
                 _splitTime = (splitTime == 0f) ? _splitTime : splitTime;
@@ -207,7 +207,7 @@ public override GameSupportResult OnUpdate(GameState state)
             if (_onceFlag)
                 return GameSupportResult.DoNothing;
 
-            if (IsLastMap && state.PlayerViewEntityIndex != GameState.ENT_INDEX_PLAYER)
+            if (IsLastMap && state.PlayerViewEntityIndex.Current != GameState.ENT_INDEX_PLAYER)
             {
                 float splitTime = state.FindOutputFireTime("clientcommand", 8);
                 _splitTime = (splitTime == 0f) ? _splitTime : splitTime;
@@ -442,8 +442,8 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (this.IsLastMap && _endCameraIndex != -1)
             {
-                if (state.PrevPlayerViewEntityIndex == 1 &&
-                    state.PlayerViewEntityIndex == _endCameraIndex)
+                if (state.PlayerViewEntityIndex.Old == 1 &&
+                    state.PlayerViewEntityIndex.Current == _endCameraIndex)
                 {
                     _onceFlag = true;
                     Debug.WriteLine("school_adventures end");

diff --git a/GameSpecific/HL2Mods/HL2Mods_Precursor.cs b/GameSpecific/HL2Mods/HL2Mods_Precursor.cs
@@ -45,7 +45,7 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (this.IsFirstMap)
             {
-                if (state.PrevPlayerViewEntityIndex == _startCamIndex && state.PlayerViewEntityIndex == 1)
+                if (state.PlayerViewEntityIndex.Old == _startCamIndex && state.PlayerViewEntityIndex.Current == 1)
                 {
                     _onceFlag = true;
                     Debug.WriteLine("precursor start");
@@ -54,7 +54,7 @@ public override GameSupportResult OnUpdate(GameState state)
             }
             else if (this.IsLastMap)
             {
-                if (state.PrevPlayerViewEntityIndex == 1 && state.PlayerViewEntityIndex == _endCamIndex)
+                if (state.PlayerViewEntityIndex.Old == 1 && state.PlayerViewEntityIndex.Current == _endCamIndex)
                 {
                     _onceFlag = true;
                     Debug.WriteLine("precursor end");

diff --git a/GameSpecific/HL2Mods/HL2Mods_Ptsd1.cs b/GameSpecific/HL2Mods/HL2Mods_Ptsd1.cs
@@ -50,8 +50,8 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (this.IsFirstMap && _camIndex != -1)
             {
-                if (state.PrevPlayerViewEntityIndex == _camIndex
-                    && state.PlayerViewEntityIndex == GameState.ENT_INDEX_PLAYER)
+                if (state.PlayerViewEntityIndex.Old == _camIndex
+                    && state.PlayerViewEntityIndex.Current == GameState.ENT_INDEX_PLAYER)
                 {
                     Debug.WriteLine("ptsd start");
                     _onceFlag = true;

diff --git a/GameSpecific/HL2Mods/HL2Mods_SnipersEp.cs b/GameSpecific/HL2Mods/HL2Mods_SnipersEp.cs
@@ -54,7 +54,7 @@ public override GameSupportResult OnUpdate(GameState state)
 
             if (this.IsFirstMap)
             {
-                if (state.PrevPlayerPosition.BitEqualsXY(_startPos) && !state.PlayerPosition.BitEqualsXY(_startPos) && !_resetFlag)
+                if (state.PlayerPosition.Old.BitEqualsXY(_startPos) && !state.PlayerPosition.Current.BitEqualsXY(_startPos) && !_resetFlag)
                 {
                     _resetFlag = true;
                     return GameSupportResult.PlayerGainedControl;