Fix a few more breakpoint issues

psyGamer · Mar 1, 2024 · bd9c69f · bd9c69f
1 parent 8356575
commit bd9c69f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/Source/TAS/Input/InputController.cs b/Source/TAS/Input/InputController.cs
@@ -37,6 +37,8 @@ public class InputController
     public FastForward? CurrentFastForward => FastForwards.FirstOrDefault(pair => pair.Key > CurrentFrameInTas).Value ??
                                               FastForwards.LastOrDefault().Value;
 
+    public bool Break => CurrentFastForward?.Frame == CurrentFrameInTas;
+
     public bool ShouldFastForward => CurrentFastForward is { } forward && forward.Frame > CurrentFrameInTas;
 
     public bool CanPlayback => CurrentFrameInTas < Inputs.Count;
@@ -180,10 +182,6 @@ public void ReadLines(IEnumerable<string> lines, string filePath, int startLine,
             // TODO: Is the goto here required?
             string lineText = readLine.Trim();
 
-            // Empty / Comment
-            if (lineText.IsNullOrWhiteSpace() || lineText.StartsWith('#') || blockCommentMode)
-                goto NextLine;
-
             // Block comments
             if (lineText.StartsWith("/*"))
             {
@@ -196,6 +194,10 @@ public void ReadLines(IEnumerable<string> lines, string filePath, int startLine,
                 goto NextLine;
             }
 
+            // Empty / Comment
+            if (lineText.IsNullOrWhiteSpace() || lineText.StartsWith('#') || blockCommentMode)
+                goto NextLine;
+
             if (Command.TryParse(this, filePath, subLine, lineText, initializationFrameCount, studioLine, out var _))
             {
                 goto NextLine;
@@ -266,7 +268,7 @@ public void Clear() {
         // savestateChecksum = string.Empty;
         Inputs.Clear();
         Commands.Clear();
-        // FastForwards.Clear();
+        FastForwards.Clear();
         // FastForwardComments.Clear();
         // Comments.Clear();
         usedFiles.Clear();

diff --git a/Source/TAS/Manager.cs b/Source/TAS/Manager.cs
@@ -47,8 +47,7 @@ public static void EnableRun()
     {
         Log.Info($"Starting TAS: {InputController.TasFilePath}");
 
-        CurrState = State.Running;
-        NextState = State.Running;
+        CurrState = NextState = State.Running;
         AttributeUtils.Invoke<EnableRunAttribute>();
         Controller.Stop();
         Controller.Clear();
@@ -79,6 +78,13 @@ public static void Update()
         {
             Controller.AdvanceFrame(out bool canPlayback);
 
+            // Stop TAS if breakpoint is not placed at the end
+            if (Controller.Break && Controller.CanPlayback) {
+                // Controller.NextCommentFastForward = null;
+                NextState = State.Paused;
+                return;
+            }
+
             if (!canPlayback)
             {
                 DisableRun();
@@ -121,6 +127,7 @@ public static void AbortTas(string message)
     public static bool IsLoading()
     {
         return !(Game.Instance.transitionStep == Game.TransitionStep.FadeIn ||
+                 Game.Instance.transitionStep == Game.TransitionStep.Perform ||
                  Game.Instance.transitionStep == Game.TransitionStep.None);
     }
 

diff --git a/Source/TAS/TASMod.cs b/Source/TAS/TASMod.cs
@@ -116,8 +116,8 @@ private static void On_App_Tick_Update(orig_App_Tick_Update orig, TimeSpan delta
         // Don't do anything if TAS isn't running
         if (!Manager.Running)
         {
+            TASMod.Update();
             orig(delta);
-            Update();
             return;
         }
 
@@ -155,16 +155,11 @@ private static void On_App_Tick_Update(orig_App_Tick_Update orig, TimeSpan delta
             orig(delta);
         }
 
-        if (Manager.Running && Manager.Controller.ShouldFastForward)
+        // Fast forward to breakpoint
+        while (Manager.Running && Manager.Controller.ShouldFastForward)
         {
-            // Fast forward to breakpoint
-            while (Manager.Running && Manager.Controller.ShouldFastForward)
-            {
-                TASMod.Update();
-                orig(delta);
-            }
-            // And pause after that
-            Manager.NextState = Manager.State.Paused;
+            TASMod.Update();
+            orig(delta);
         }
     }