Prevent defining Button class breaking CyanEmu. (Should fix Noodle Bo…

…wl imports)
CyanLaser · Jul 4, 2021 · 37e44e2 · 37e44e2
1 parent d832959
commit 37e44e2
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/CyanEmu/Scripts/CyanEmuPlayerController.cs b/CyanEmu/Scripts/CyanEmuPlayerController.cs
@@ -4,6 +4,10 @@
 using VRC.SDKBase;
 using System.Reflection;
 
+// Noodle bowl defines its own button class, which would break CyanEmu.
+// Ensuring button is properly defined with this using statement.
+using UIButton = UnityEngine.UI.Button; 
+
 #if UDON
 using VRC.Udon;
 using VRC.Udon.Common;
@@ -297,7 +301,7 @@ private void CreateMenu()
             respawnButton.transform.SetParent(menu_.transform, false);
             respawnButton.transform.localPosition = new Vector3(60, 0, 0);
             respawnButton.AddComponent<Image>();
-            Button button = respawnButton.AddComponent<Button>();
+            UIButton button = respawnButton.AddComponent<UIButton>();
             button.onClick.AddListener(Respawn);
 
             GameObject respawnText = new GameObject("RespawnText");
@@ -319,7 +323,7 @@ private void CreateMenu()
             exitMenuButton.transform.SetParent(menu_.transform, false);
             exitMenuButton.transform.localPosition = new Vector3(-60, 0, 0);
             exitMenuButton.AddComponent<Image>();
-            button = exitMenuButton.AddComponent<Button>();
+            button = exitMenuButton.AddComponent<UIButton>();
             button.onClick.AddListener(CloseMenu);
 
             GameObject exitMenuText = new GameObject("ExitMenuText");