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

fix: prevents async (i.e. events that are yielded to) from overlapping

Browse Source
This commit is contained in:
Duncan Brown
2022-04-11 22:20:39 -04:00
committed by Julian Murgia
parent c92c4edacf
commit 3ff3849232
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,9 +48,12 @@ var events_queue: Dictionary = {
# Currently running event in background channels # Currently running event in background channels
var _running_events: Dictionary = {} var _running_events: Dictionary = {}
# Wether 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.
var _yielding: bool = false
# Make sure to stop when pausing the game # Make sure to stop when pausing the game
func _ready(): func _ready():
@@ -63,7 +66,7 @@ func _ready():
# - 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:
for channel_name in events_queue.keys(): for channel_name in events_queue.keys():
if events_queue[channel_name].size() == 0: if events_queue[channel_name].size() == 0 or _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
@@ -124,7 +127,13 @@ func _process(delta: float) -> void:
if event_flags & ESCEvent.FLAG_NO_SAVE: if event_flags & ESCEvent.FLAG_NO_SAVE:
escoria.save_manager.save_enabled = false escoria.save_manager.save_enabled = false
_running_events[channel_name].run() var rc = _running_events[channel_name].run()
if rc is GDScriptFunctionState:
_yielding = true
rc = yield(rc, "completed")
_yielding = false
for event in self.scheduled_events: for event in self.scheduled_events:
(event as ESCScheduledEvent).timeout -= delta (event as ESCScheduledEvent).timeout -= delta
if (event as ESCScheduledEvent).timeout <= 0: if (event as ESCScheduledEvent).timeout <= 0: