From a4381d972d3922a123f645281d14fcae86170b6b Mon Sep 17 00:00:00 2001 From: Ryan Reed Date: Sat, 8 Mar 2025 15:30:47 -0500 Subject: [PATCH] Fix: Disable actions when options screen is active --- autoloads/globals.gd | 2 ++ scenes/player/ray_cast_3d.gd | 2 ++ scenes/ui/ui.gd | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/autoloads/globals.gd b/autoloads/globals.gd index eae639a..d3c374a 100644 --- a/autoloads/globals.gd +++ b/autoloads/globals.gd @@ -7,3 +7,5 @@ const DROPPED_BLOCK_PREFAB: PackedScene = preload("res://scenes/blocks/dropped_b var enable_waila: bool = true ## Enable `What Am I Looking At` UI var enable_block_highlight: bool = true + +var is_options_menu_active: bool = false diff --git a/scenes/player/ray_cast_3d.gd b/scenes/player/ray_cast_3d.gd index 515c8a1..e90bb34 100644 --- a/scenes/player/ray_cast_3d.gd +++ b/scenes/player/ray_cast_3d.gd @@ -2,6 +2,8 @@ extends RayCast3D func _process(_delta: float) -> void: + if Globals.is_options_menu_active: return + if is_colliding(): var collider: Object = get_collider() diff --git a/scenes/ui/ui.gd b/scenes/ui/ui.gd index 5bc0911..165669b 100644 --- a/scenes/ui/ui.gd +++ b/scenes/ui/ui.gd @@ -14,9 +14,11 @@ func _process(_delta: float) -> void: func toggle_options_menu() -> void: - crosshair.visible = !options_menu.visible options_menu.visible = !options_menu.visible + Globals.is_options_menu_active = options_menu.visible + crosshair.visible = !options_menu.visible quick_slots.visible = !options_menu.visible + if options_menu.visible: waila.visible = false Input.mouse_mode = Input.MOUSE_MODE_VISIBLE