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

Fix call to interrupt method after acfb3d9ddd

Browse Source
This commit is contained in:
Julian Murgia
2022-08-18 22:14:47 +02:00
committed by Duncan Brown
parent 04348147b9
commit 238b1d28f1
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -564,7 +564,7 @@ func perform_inputevent_on_object(
# Manage exits # Manage exits
if obj.node.is_exit and current_action in ["", ACTION_WALK]: if obj.node.is_exit and current_action in ["", ACTION_WALK]:
escoria.event_manager.interrupt_running_event() escoria.event_manager.interrupt()
escoria.event_manager.clear_event_queue() escoria.event_manager.clear_event_queue()
_activate(ACTION_EXIT_SCENE, obj) _activate(ACTION_EXIT_SCENE, obj)
else: else:

6
project.godot
View File

@@ -349,6 +349,11 @@ _global_script_classes=[ {
"language": "GDScript", "language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_script.gd" "path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_script.gd"
}, { }, {
"base": "Reference",
"class": "ESCSettingsManager",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/save_data/esc_settings_manager.gd"
}, {
"base": "Control", "base": "Control",
"class": "ESCSoundPlayer", "class": "ESCSoundPlayer",
"language": "GDScript", "language": "GDScript",
@@ -658,6 +663,7 @@ _global_script_class_icons={
"ESCSaveSettings": "", "ESCSaveSettings": "",
"ESCScheduledEvent": "", "ESCScheduledEvent": "",
"ESCScript": "", "ESCScript": "",
"ESCSettingsManager": "",
"ESCSoundPlayer": "", "ESCSoundPlayer": "",
"ESCSpeechPlayer": "", "ESCSpeechPlayer": "",
"ESCStatement": "", "ESCStatement": "",