diff --git a/Game/Assets/HUD/Chat.gd b/Game/Assets/HUD/Chat.gd index 612eb89..1ec468a 100644 --- a/Game/Assets/HUD/Chat.gd +++ b/Game/Assets/HUD/Chat.gd @@ -4,17 +4,19 @@ extends Control enum ChatState {INACTIVE, TYPING_ALL, TYPING_TEAM} +enum GameFocus {MENU, GAME, CHAT, AWAY} # copied from Main.gd TODO: delete this + var state = ChatState.INACTIVE : set(new_state): state = new_state match new_state: - ChatState.INACTIVE: + 0: #ChatState.INACTIVE: $VBoxContainer/Typing.hide() $VBoxContainer/Typing/LineEdit.release_focus() - ChatState.TYPING_ALL: + 1: #ChatState.TYPING_ALL: $VBoxContainer/Typing.show() $VBoxContainer/Typing/LineEdit.grab_focus() - ChatState.TYPING_TEAM: + 2: #ChatState.TYPING_TEAM: $VBoxContainer/Typing.show() $VBoxContainer/Typing/LineEdit.grab_focus() @@ -24,19 +26,19 @@ func _ready(): func _input(event) -> void: if Input.is_action_just_pressed("say_all"): - main.focus = main.GameFocus.CHAT - state = ChatState.TYPING_ALL + main.focus = 1 #main.GameFocus.CHAT + state = 1 #ChatState.TYPING_ALL if Input.is_action_just_pressed("say_team"): - main.focus = main.GameFocus.CHAT - state = ChatState.TYPING_TEAM + main.focus = 1 #main.GameFocus.CHAT + state = 2 #ChatState.TYPING_TEAM - if Input.is_action_just_pressed("UI_Accept") and state != ChatState.INACTIVE: + if Input.is_action_just_pressed("UI_Accept") and state != 0: #ChatState.INACTIVE: $VBoxContainer/ChatHistory.text.append($VBoxContainer/Typing/LineEdit.text) $VBoxContainer/Typing/LineEdit.text.clear() - state = ChatState.INACTIVE - main.focus = main.GameFocus.GAME + state = 0 #ChatState.INACTIVE + main.focus = 0 #main.GameFocus.GAME func _unhandled_input(event) -> void: - if state != ChatState.INACTIVE: - get_tree().set_input_as_handled() + if state != 0: #ChatState.INACTIVE: + get_tree().get_root().set_input_as_handled()