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

Move Escoria settings load action out of init (#414)

Browse Source 
InputMap actions added/removed at plugin enabled/disabled
Some changes to README
Co-authored-by: StraToN <StraToN@users.noreply.github.com>
This commit is contained in:
Julian Murgia
2021-10-14 21:56:02 +02:00
committed by GitHub
parent 00de7fcc4d
commit c859cffa33
6 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
addons/escoria-core/game/escoria.gd
View File

@@ -108,8 +108,6 @@ func _init():
self.controller = ESCController.new()
settings = ESCSaveSettings.new()
settings = save_manager.load_settings()
_on_settings_loaded(settings)
if ProjectSettings.get_setting("escoria/ui/game_scene") == "":
logger.report_errors("escoria.gd",
@@ -123,7 +121,14 @@ func _init():
# Load settings
func _ready():
settings = save_manager.load_settings()
_on_settings_loaded(settings)
inputs_manager.register_core()
if ProjectSettings.get_setting("escoria/main/game_start_script").empty():
logger.report_errors("escoria.gd",
[
"Project setting 'escoria/main/game_start_script' is not set!"
])
start_script = self.esc_compiler.load_esc_file(
ProjectSettings.get_setting("escoria/main/game_start_script")
)
@@ -288,7 +293,8 @@ func _on_settings_loaded(p_settings: ESCSaveSettings) -> void:
# Input function to manage specific input keys
func _input(event):
if event.is_action_pressed("esc_show_debug_prompt"):
if InputMap.has_action("esc_show_debug_prompt") \
and event.is_action_pressed("esc_show_debug_prompt"):
escoria.main.get_node("layers/debug_layer/esc_prompt_popup").popup()
if event.is_action_pressed("ui_cancel"):