Skip to content
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

Wait for transition before loading #3616

Merged
merged 3 commits into from
Jul 31, 2022
Merged

Wait for transition before loading #3616

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66c1fd9
wait for transition
DrRadek Jul 28, 2022
4b27adf
register callback instead of manual checking
DrRadek Jul 28, 2022
551c698
Merge branch 'master' into loading_animation_fix
DrRadek Jul 30, 2022
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
8 changes: 5 additions & 3 deletions src/saving/InProgressLoad.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,19 +79,21 @@ private void Step()
MainGameState.Invalid,
TranslationServer.Translate("READING_SAVE_DATA"));

TransitionManager.Instance.AddSequence(ScreenFade.FadeType.FadeIn, 0.5f, null, false, false);
TransitionManager.Instance.AddSequence(ScreenFade.FadeType.FadeIn, 0.5f, Step, false, false);

// Let all suppressed deletions happen
TemporaryLoadedNodeDeleter.Instance.ReleaseAllHolds();
JSONDebug.FlushJSONTracesOut();

break;
// Continue after transition finishes
return;
case State.ReadingData:
{
// Start suppressing loaded node deletion
TemporaryLoadedNodeDeleter.Instance.AddDeletionHold(Constants.DELETION_HOLD_LOAD);

// TODO: do this in a background thread if possible
// TODO: do this in a background thread once possible
// https://github.com/Revolutionary-Games/Thrive/issues/1406
try
{
// Invalid is given as the target state here, because it's unknown yet.
Expand Down