Fix the help overlay fade.

RosaryMala · Mar 6, 2017 · c4e29d5 · c4e29d5
1 parent cfad6d4
commit c4e29d5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Assets/MapGen/ContentLoader.cs b/Assets/MapGen/ContentLoader.cs
@@ -248,7 +248,7 @@ IEnumerator LoadAssets()
         Debug.Log("Took a total of " + watch.ElapsedMilliseconds + "ms to load all XML files.");
         Debug.Log(string.Format("loaded {0} meshes, {1} pattern textures, {2} colors, and {3} shape textures.", MeshContent.NumCreated, TextureContent.NumCreated, ColorContent.NumCreated, NormalContent.NumCreated));
         Debug.Log("Loading Complete. Press ESC to change settings or leave feedback. Have a nice day!");
-        StartCoroutine(GameMap.Instance.EnableHelp());
+        GameMap.Instance.ShowHelp();
         yield return null;
     }
 

diff --git a/Assets/MapGen/GameMap.cs b/Assets/MapGen/GameMap.cs
@@ -377,21 +377,26 @@ void Update()
     }
 
     public float helpFadeLength = 0.5f;
+    Coroutine helpFade;
     bool helpEnabled = false;
     private void ToggleHelp()
     {
-        StopCoroutine(EnableHelp());
-        StopCoroutine(DisableHelp());
+        StopCoroutine(helpFade);
         if (helpEnabled)
         {
-            StartCoroutine(DisableHelp());
+            helpFade = StartCoroutine(DisableHelp());
         }
         else
         {
-            StartCoroutine(EnableHelp());
+            ShowHelp();
         }
     }
 
+    public void ShowHelp()
+    {
+        helpFade = StartCoroutine(EnableHelp());
+    }
+
     IEnumerator DisableHelp()
     {
         helpEnabled = false;
@@ -403,7 +408,7 @@ IEnumerator DisableHelp()
         helpOverlay.gameObject.SetActive(false);
         yield return null;
     }
-    public IEnumerator EnableHelp()
+    IEnumerator EnableHelp()
     {
         helpEnabled = true;
         helpOverlay.gameObject.SetActive(true);