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

fix: should now block for yielding events but only on the same channel

Browse Source
This commit is contained in:
Duncan Brown
2022-04-13 15:19:05 -04:00
committed by Julian Murgia
parent 3ff3849232
commit 92e23beb00
1 changed files with 9 additions and 5 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

@@ -51,8 +51,8 @@ var _running_events: Dictionary = {}
# Whether an event can be played on a specific channel # Whether an event can be played on a specific channel
var _channels_state: Dictionary = {} var _channels_state: Dictionary = {}
# Whether we're currently waiting for an async event to complete. # Whether we're currently waiting for an async event to complete, per channel
var _yielding: bool = false var _yielding: Dictionary = {}
# Make sure to stop when pausing the game # Make sure to stop when pausing the game
@@ -65,8 +65,12 @@ func _ready():
# #### Parameters # #### Parameters
# - delta: Time passed since the last process call # - delta: Time passed since the last process call
func _process(delta: float) -> void: func _process(delta: float) -> void:
var channel_yielding: bool
for channel_name in events_queue.keys(): for channel_name in events_queue.keys():
if events_queue[channel_name].size() == 0 or _yielding: channel_yielding = _yielding.get(channel_name, false)
if events_queue[channel_name].size() == 0 or channel_yielding:
continue continue
if is_channel_free(channel_name): if is_channel_free(channel_name):
_channels_state[channel_name] = false _channels_state[channel_name] = false
@@ -130,9 +134,9 @@ func _process(delta: float) -> void:
var rc = _running_events[channel_name].run() var rc = _running_events[channel_name].run()
if rc is GDScriptFunctionState: if rc is GDScriptFunctionState:
_yielding = true _yielding[channel_name] = true
rc = yield(rc, "completed") rc = yield(rc, "completed")
_yielding = false _yielding[channel_name] = false
for event in self.scheduled_events: for event in self.scheduled_events:
(event as ESCScheduledEvent).timeout -= delta (event as ESCScheduledEvent).timeout -= delta