Games that override ondestroy now destroy their inputs when they are destroyed (#449)

Assets/Scripts/Games/AirRally/AirRally.cs

@@ -109,7 +109,11 @@ namespace HeavenStudio.Games
 
         void OnDestroy()
         {
-            if (queuedVoiceLines.Count > 0) queuedVoiceLines.Clear(); 
+            if (queuedVoiceLines.Count > 0) queuedVoiceLines.Clear();
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         void Start()

Assets/Scripts/Games/BlueBear/BlueBear.cs

@@ -116,6 +116,10 @@ namespace HeavenStudio.Games
             rightCrumbAppearThreshold = 15;
             leftCrumbAppearThreshold = 30;
             eatenTreats = 0;
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         private void Awake()

Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs

@@ -181,6 +181,10 @@ namespace HeavenStudio.Games
             currentShooterColor = Color.white;
             currentEnvironmentColor = new Color(0, 1, 0, 1);
             UpdateColors();
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         private void Start()

Assets/Scripts/Games/CheerReaders/CheerReaders.cs

@@ -178,6 +178,10 @@ namespace HeavenStudio.Games
         void OnDestroy()
         {
             Jukebox.KillLoop(SpinningLoop, 0.5f);
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         public override void OnTimeChange()

Assets/Scripts/Games/DogNinja/DogNinja.cs

@@ -185,6 +185,10 @@ namespace HeavenStudio.Games
             if (!Conductor.instance.isPlaying || Conductor.instance.isPaused) {
                 if (queuedThrows.Count > 0) queuedThrows.Clear();
             }
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         private void Update()

Assets/Scripts/Games/DoubleDate/DoubleDate.cs

@@ -116,6 +116,10 @@ namespace HeavenStudio.Games
 
         private void OnDestroy() {
             queuedBalls.Clear();
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         private void Awake()

Assets/Scripts/Games/Fireworks/Fireworks.cs

@@ -132,6 +132,10 @@ namespace HeavenStudio.Games
         void OnDestroy()
         {
             if (queuedFireworks.Count > 0) queuedFireworks.Clear();
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         void Awake()

Assets/Scripts/Games/FirstContact/FirstContact.cs

@@ -166,6 +166,10 @@ namespace HeavenStudio.Games
             {
                 if (queuedInputs.Count > 0) queuedInputs.Clear();
             }
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         private void Awake()

Assets/Scripts/Games/FlipperFlop/FlipperFlop.cs

@@ -188,6 +188,10 @@ namespace HeavenStudio.Games
             if (queuedInputs.Count > 0) queuedInputs.Clear();
             if (queuedAttentions.Count > 0) queuedAttentions.Clear();
             if (queuedFlipperRollVoiceLines.Count > 0) queuedFlipperRollVoiceLines.Clear();
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         private void Update()

Assets/Scripts/Games/GleeClub/GleeClub.cs

@@ -178,6 +178,10 @@ namespace HeavenStudio.Games
                 if (queuedSingings.Count > 0) queuedSingings.Clear();
                 if (queuedBatons.Count > 0) queuedBatons.Clear();
             }
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         void Update()

Assets/Scripts/Games/LaunchParty/LaunchParty.cs

@@ -205,6 +205,10 @@ namespace HeavenStudio.Games
         void OnDestroy()
         {
             if (queuedRockets.Count > 0) queuedRockets.Clear();
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         } 
 
         void Awake()

Assets/Scripts/Games/Lockstep/Lockstep.cs

@@ -194,6 +194,10 @@ namespace HeavenStudio.Games
         void OnDestroy()
         {
             if (queuedInputs.Count > 0) queuedInputs.Clear();
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         void UpdateAndRenderSlaves()

Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs

@@ -119,6 +119,10 @@ namespace HeavenStudio.Games
                 if (queuedIntervals.Count > 0) queuedIntervals.Clear();
                 intervalStarted = false;
             }
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         private void Update() 

Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs

@@ -134,6 +134,10 @@ namespace HeavenStudio.Games
             // these variables wouldn't get reset, even when you go in and out of unity play mode???
             shouldBlip = false;
             stepIterate = 0;
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         public void Update()

Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs

@@ -244,6 +244,11 @@ namespace HeavenStudio.Games
             inputsTilGrow = 10;
             noBlush = false;
             disableBaby = false;
+
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         private void Update() 

Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs

@@ -229,6 +229,11 @@ namespace HeavenStudio.Games
             if (queuedPops.Count > 0) queuedPops.Clear();
             
             mat.SetColor("_ColorAlpha", new Color(0.97f, 0.235f, 0.54f));
+
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         private void Update() 

Assets/Scripts/Games/QuizShow/QuizShow.cs

@@ -195,6 +195,10 @@ namespace HeavenStudio.Games
             {
                 if (queuedInputs.Count > 0) queuedInputs.Clear();
             }
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         void Awake()

Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs

@@ -269,6 +269,10 @@ namespace HeavenStudio.Games
             {
                 crHandlerInstance = null;
             }
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         public static void SpawnHairInactive(float beat)

Assets/Scripts/Games/Ringside/Ringside.cs

@@ -164,6 +164,10 @@ namespace HeavenStudio.Games
         {
             if (queuedPoses.Count > 0) queuedPoses.Clear();
             Jukebox.KillLoop(kidsLaugh, 2f);
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         public override void OnTimeChange()

Assets/Scripts/Games/Rockers/Rockers.cs

@@ -545,6 +545,10 @@ namespace HeavenStudio.Games
             }
             if (queuedCameraEvents.Count > 0) queuedCameraEvents.Clear();
             if (queuedPreInterval.Count > 0) queuedPreInterval.Clear();
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         private void Update()

Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs

@@ -94,6 +94,10 @@ namespace HeavenStudio.Games
         {
             if (queuedGhosts.Count > 0) queuedGhosts.Clear();
             Conductor.instance.SetMinigamePitch(1f);
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         void Awake()

Assets/Scripts/Games/Tambourine/Tambourine.cs

@@ -156,6 +156,10 @@ namespace HeavenStudio.Games
             {
                 if (queuedInputs.Count > 0) queuedInputs.Clear();
             }
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         void Update()

Assets/Scripts/Games/TapTroupe/TapTroupe.cs

@@ -165,6 +165,10 @@ namespace HeavenStudio.Games
             if (queuedSteps.Count > 0) queuedSteps.Clear();
             if (queuedTaps.Count > 0) queuedTaps.Clear();
             prepareTap = false;
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         public override void OnTimeChange()

Assets/Scripts/Games/TheDazzles/TheDazzles.cs

@@ -209,6 +209,10 @@ namespace HeavenStudio.Games
         {
             if (queuedPoses.Count > 0) queuedPoses.Clear();
             if (queuedCrouches.Count > 0) queuedCrouches.Clear();
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         void Awake()

Assets/Scripts/Games/TrickClass/TrickClass.cs

@@ -101,6 +101,10 @@ namespace HeavenStudio.Games
         void OnDestroy()
         {
             if (queuedInputs.Count > 0) queuedInputs.Clear();
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         private void Awake()

Assets/Scripts/Games/Tunnel/Tunnel.cs

@@ -85,6 +85,10 @@ namespace HeavenStudio.Games
         void OnDestroy()
         {
             if (queuedInputs.Count > 0) queuedInputs.Clear();
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         private void Start()

Assets/Scripts/Games/WorkingDough/WorkingDough.cs

@@ -477,6 +477,10 @@ namespace HeavenStudio.Games
         {
             if (queuedIntervals.Count > 0) queuedIntervals.Clear();
             if (queuedBalls.Count > 0) queuedBalls.Clear();
+            foreach (var evt in scheduledInputs)
+            {
+                evt.Disable();
+            }
         }
 
         void Update()