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

fix: ensures a failed command/event doesn't leave the game in a state where it isn't accepting inputs.

Browse Source
This commit is contained in:
Duncan Brown
2022-10-28 12:47:50 -04:00
committed by Julian Murgia
parent 17d127b0f2
commit 88214e4611
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
addons/escoria-core/game/core-scripts/esc/esc_event_manager.gd
View File

@@ -380,14 +380,14 @@ func _on_event_finished(finished_statement: ESCStatement, return_code: int, chan
if not event: if not event:
escoria.logger.warn( escoria.logger.warn(
self, self,
"Event %s finished without being in _running_events[%s]." "Event '%s' finished without being in _running_events[%s]."
% [finished_statement.name, channel_name] % [finished_statement.name, channel_name]
) )
return return
escoria.logger.debug( escoria.logger.debug(
self, self,
"Event %s ended with return code %d." % [event.name, return_code] "Event '%s' ended with return code %d." % [event.name, return_code]
) )
var event_flags = event.flags var event_flags = event.flags
@@ -402,8 +402,18 @@ func _on_event_finished(finished_statement: ESCStatement, return_code: int, chan
# If the return code was RC_CANCEL due to an event finishing with "stop" command for example # If the return code was RC_CANCEL due to an event finishing with "stop" command for example
# we convert it to RC_OK so that other processed waiting for RC_OK can carry on. # we convert it to RC_OK so that other processed waiting for RC_OK can carry on.
#
# We also make sure that a failed command/event doesn't leave the game in a state where it
# isn't accepting inputs, e.g. if a previous command in the event was `accept_input NONE`.
if return_code == ESCExecution.RC_CANCEL: if return_code == ESCExecution.RC_CANCEL:
return_code = ESCExecution.RC_OK return_code = ESCExecution.RC_OK
elif return_code == ESCExecution.RC_ERROR:
escoria.logger.warn(
self,
"Statement '%s' returned an error in event '%s'. Resetting input mode to 'ALL'."
% [finished_statement.name, event.name]
)
escoria.inputs_manager.input_mode = escoria.inputs_manager.INPUT_ALL
_running_events[channel_name] = null _running_events[channel_name] = null
_channels_state[channel_name] = true _channels_state[channel_name] = true