Skip to content

Fix "timeline info could reset after new timeline was loaded" #2184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2024
Merged

Fix "timeline info could reset after new timeline was loaded" #2184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions addons/dialogic/Core/DialogicGameHandler.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,22 +287,22 @@ func handle_event(event_index:int) -> void:
## By using the clear flags from the [member ClearFlags] enum you can specify
## what info should be kept.
## For example, at timeline end usually it doesn't clear node or subsystem info.
func clear(clear_flags := ClearFlags.FULL_CLEAR) -> bool:

func clear(clear_flags := ClearFlags.FULL_CLEAR) -> void:
if !clear_flags & ClearFlags.TIMELINE_INFO_ONLY:
for subsystem in get_children():
if subsystem is DialogicSubsystem:
(subsystem as DialogicSubsystem).clear_game_state(clear_flags)

# Resetting variables
if current_timeline:
await current_timeline.clean()
var timeline := current_timeline

current_timeline = null
current_event_idx = -1
current_timeline_events = []
current_state = States.IDLE
return true

# Resetting variables
if timeline:
await timeline.clean()

#endregion

Expand Down