(Hopefully) fix crashes with reloads and flag rainbow spinner control…

…lers
maddie480 · Dec 2, 2023 · 75a6856 · 75a6856
1 parent 5b8e132
commit 75a6856
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Entities/RainbowSpinnerColorController.cs b/Entities/RainbowSpinnerColorController.cs
@@ -175,7 +175,7 @@ internal void ApplyToSession() {
         public override void Awake(Scene scene) {
             base.Awake(scene);
 
-            flagLatestState = !string.IsNullOrEmpty(flag) && SceneAs<Level>().Session.GetFlag(flag);
+            flagLatestState = isFlagActive();
 
             // this is the controller for the next screen.
             nextSpinnerController = this;
@@ -224,7 +224,7 @@ public override void Update() {
             // all spinners have the cycle randomly offset, so they don't get the new colors at the same time,
             // making for a weird visual effect.
             // so we want to update the hue of **all** spinners forcibly when the flag is toggled.
-            bool flagState = !string.IsNullOrEmpty(flag) && SceneAs<Level>().Session.GetFlag(flag);
+            bool flagState = isFlagActive();
             if (flagState != flagLatestState) {
                 flagLatestState = flagState;
 
@@ -239,7 +239,7 @@ public override void Update() {
         }
 
         private T selectFromFlag<T>(Tuple<T, T> setting) {
-            if (string.IsNullOrEmpty(flag) || !SceneAs<Level>().Session.GetFlag(flag)) {
+            if (!isFlagActive()) {
                 return setting.Item1;
             }
             return setting.Item2;
@@ -332,5 +332,9 @@ internal static Color getModHue(Color[] colors, float gradientSize, Scene scene,
             float progressInIndex = globalProgress - colorIndex;
             return Color.Lerp(colors[colorIndex], colors[colorIndex + 1], progressInIndex);
         }
+
+        private bool isFlagActive() {
+            return !string.IsNullOrEmpty(flag) && Scene is Level level && level.Session.GetFlag(flag);
+        }
     }
 }