oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: Fixed input problems (#440)

Browse Source 
Authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Julian Murgia
2021-11-14 13:36:59 +01:00
committed by GitHub
parent eb04020a92
commit c4d1432d66
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/escoria-core/game/core-scripts/esc_background.gd
View File

@@ -82,7 +82,7 @@ func _ready():
# #
# #### Parameters # #### Parameters
# - event: Event received # - event: Event received
func _input(event) -> void: func _unhandled_input(event) -> void:
if not escoria.current_state == escoria.GAME_STATE.DEFAULT: if not escoria.current_state == escoria.GAME_STATE.DEFAULT:
return return
if InputMap.has_action("switch_action_verb") \ if InputMap.has_action("switch_action_verb") \

5
addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd
View File

@@ -34,9 +34,10 @@ func _ready():
# #
# - event: The input event # - event: The input event
func _input(event): func _input(event):
if event is InputEventMouseButton and \ if event is InputEventMouseButton and event.pressed \
event.pressed: and is_speaking:
speedup() speedup()
get_tree().set_input_as_handled()
# Find the matching voice output file for the given key # Find the matching voice output file for the given key

6
project.godot
View File

@@ -673,7 +673,7 @@ search_in_file_extensions=PoolStringArray( "gd", "shader", "esc" )
[editor_plugins] [editor_plugins]
enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-dialog-simple/plugin.cfg", "res://addons/escoria-ui-9verbs/plugin.cfg" ) enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-dialog-simple/plugin.cfg", "res://addons/escoria-ui-simplemouse/plugin.cfg" )
[escoria] [escoria]
@@ -682,7 +682,7 @@ main/force_quit=true
debug/terminate_on_warnings=false debug/terminate_on_warnings=false
debug/terminate_on_errors=true debug/terminate_on_errors=true
debug/development_lang="en" debug/development_lang="en"
ui/tooltip_follows_mouse=false ui/tooltip_follows_mouse=true
main/text_lang="fr_FR" main/text_lang="fr_FR"
main/voice_lang="fr_FR" main/voice_lang="fr_FR"
sound/music_volume=1 sound/music_volume=1
@@ -699,7 +699,7 @@ main/savegames_path="res://saves/"
main/settings_path="user://" main/settings_path="user://"
main/escoria_version="" main/escoria_version=""
sound/speech_enabled=1 sound/speech_enabled=1
ui/game_scene="res://addons/escoria-ui-9verbs/game.tscn" ui/game_scene="res://addons/escoria-ui-simplemouse/game.tscn"
ui/dialogs_chooser="res://addons/escoria-core/ui_library/dialogs/text_dialog_chooser.tscn" ui/dialogs_chooser="res://addons/escoria-core/ui_library/dialogs/text_dialog_chooser.tscn"
sound/speech_folder="res://game/speech" sound/speech_folder="res://game/speech"
sound/speech_extension="ogg" sound/speech_extension="ogg"