Fixed various bugs related to playerUI menu state toggle.

hackerspace-ntnu · Oct 23, 2024 · 1d069e2 · 1d069e2
1 parent e7eafbf
commit 1d069e2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Assets/Scripts/Player/PlayerSpecificManager.cs b/Assets/Scripts/Player/PlayerSpecificManager.cs
@@ -1,6 +1,5 @@
 using System.Collections;
 using System.Collections.Generic;
-using UnityEditor.UI;
 using UnityEngine;
 using UnityEngine.InputSystem;
 

diff --git a/Assets/Scripts/Player/PlayerStateController.cs b/Assets/Scripts/Player/PlayerStateController.cs
@@ -152,8 +152,10 @@ void FixedUpdate()
                 }
 
                 if (Interact && !ui.GetBuildToggle())
-                    SetState(PlayerStates.FREE);
-
+                {
+                    OnInteract();
+                    //SetState(PlayerStates.FREE);
+                }
                 break;
         }
     }

diff --git a/Assets/Scripts/Player/PlayerUi.cs b/Assets/Scripts/Player/PlayerUi.cs
@@ -43,6 +43,7 @@ public void SetActiveUI(bool value)
 
     public void ToggleBuildMenu()
     {
+        if (playerStateController.CurrentState == PlayerStates.BUILDING) { return; }
         buildToggle = !buildToggle;
         SetActiveUI(buildToggle);
         if (buildToggle)