Bug Fixes

WormsSpeedrunning · Apr 13, 2024 · 26e2acf · 26e2acf
1 parent 9169016
commit 26e2acf
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/LiveSplit.WormsWMD.asl b/LiveSplit.WormsWMD.asl
@@ -50,28 +50,38 @@ startup {
 }
 
 start {
+    if (!current.MenuOrPaused) {
+        if (current.SelectedBonusMission.ToString() == "FE.Header.Bonus01") {
+            // Selected bonus mission is the first mission and the game is not paused
+            print(current.SelectedBonusMission.ToString());        
+            return settings["FE.Header.Bonus01"];
+        }
+    }
+
     if (!current.MenuOrPaused) {
         if (current.SelectedChallengeMission.ToString() == "FE.Header.Challenge01") {
             // Selected challenge mission is the first mission and the game is not paused
             print(current.SelectedChallengeMission.ToString());        
             return settings["FE.Header.Challenge01"];
         }
+    }
 
+    if (!current.MenuOrPaused) {
         if (current.SelectedExtraMission.ToString() == "FE.Header.Carentan1") {
             // Selected extra mission is the first mission and the game is not paused
             print(current.SelectedExtraMission.ToString());        
             return settings["FE.Header.Carentan1"];
         }
-
-        if (current.SelectedBonusMission.ToString() == "FE.Header.Bonus01") {
-            // Selected bonus mission is the first mission and the game is not paused
-            print(current.SelectedBonusMission.ToString());        
-            return settings["FE.Header.Bonus01"];
-        }
     }
 }
 
 split {
+    // If the selected bonus mission changed, split
+    if (current.SelectedBonusMission.ToString() != old.SelectedBonusMission.ToString()) {
+        print(current.SelectedBonusMission.ToString());
+        return settings[current.SelectedBonusMission.ToString()];
+    }
+
     // If the selected challenge mission changed, split
     if (current.SelectedChallengeMission.ToString() != old.SelectedChallengeMission.ToString()) {
         print(current.SelectedChallengeMission.ToString());
@@ -83,15 +93,9 @@ split {
         print(current.SelectedExtraMission.ToString());
         return settings[current.SelectedExtraMission.ToString()];
     }
-
-    // If the selected bonus mission changed, split
-    if (current.SelectedBonusMission.ToString() != old.SelectedBonusMission.ToString()) {
-        print(current.SelectedBonusMission.ToString());
-        return settings[current.SelectedBonusMission.ToString()];
-    }
 }
 
 isLoading {
     // Return true if the game is paused or in the menu
     return current.MenuOrPaused;
-}
+}