Fix action goto bug

outlander-app · May 25, 2024 · 176fd6a · 176fd6a
1 parent caf3d48
commit 176fd6a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/app/src/Outlander.xcodeproj/project.pbxproj b/app/src/Outlander.xcodeproj/project.pbxproj
@@ -1431,7 +1431,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 47;
+				CURRENT_PROJECT_VERSION = 48;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 9TZ225FMST;
@@ -1467,7 +1467,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 47;
+				CURRENT_PROJECT_VERSION = 48;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 9TZ225FMST;
 				ENABLE_HARDENED_RUNTIME = YES;

diff --git a/app/src/Outlander/Scripting/Script.swift b/app/src/Outlander/Scripting/Script.swift
@@ -89,7 +89,11 @@ protocol IWantStreamInfo {
     func execute(_ script: Script, _ context: ScriptContext)
 }
 
-protocol IAction: IWantStreamInfo {
+protocol IAction {
+    var id: String { get }
+    func stream(_ text: String, _ tokens: [StreamCommand], _ context: ScriptContext) -> CheckStreamResult
+    func execute(_ script: Script, _ context: ScriptContext)
+
     var className: String { get set }
     var enabled: Bool { get set }
     var line: ScriptLine { get set }
@@ -306,6 +310,11 @@ class Script {
         gosubStack.clear()
     }
 
+    func matchesClear() {
+        matchStack.removeAll()
+        reactToStream.removeAll()
+    }
+
     func queueNext() {
         log.info("script queue next")
         scriptQueue.queue(.next)

diff --git a/app/src/Outlander/Scripting/ScriptOperations.swift b/app/src/Outlander/Scripting/ScriptOperations.swift
@@ -78,6 +78,7 @@ class ActionOp: IAction {
                     continue
                 }
                 script.gosubClear()
+                script.matchesClear()
                 script.queueNext()
             case .exit: script.cancel()
             default: continue
@@ -139,6 +140,7 @@ class ActionEvalOp: IAction {
                     continue
                 }
                 script.gosubClear()
+                script.matchesClear()
                 script.queueNext()
             case .exit: script.cancel()
             default: continue