maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-07-04 08:31:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use proper scene load function in all cases

Browse source
This commit is contained in:
Marco 2025-02-21 12:09:42 +01:00
commit c5ed30f458
5 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Scripts/GlobalState.cs
View file

@ -27,7 +27,7 @@ public partial class GlobalState : Node
// The solution is to defer the load to a later time, when // The solution is to defer the load to a later time, when
// we can be sure that no code from the current scene is running: // we can be sure that no code from the current scene is running:
CallDeferred(MethodName.DeferredGotoScene, path); CallDeferred(MethodName.DeferredGotoScene, path, new MapStartDataResource());
} }
public void GoToScene(string path, MapStartDataResource startData) public void GoToScene(string path, MapStartDataResource startData)
@ -53,6 +53,9 @@ public partial class GlobalState : Node
// Optionally, to make it compatible with the SceneTree.change_scene_to_file() API. // Optionally, to make it compatible with the SceneTree.change_scene_to_file() API.
GetTree().CurrentScene = CurrentScene; GetTree().CurrentScene = CurrentScene;
// // Update current scene here too
// CurrentScene = GetTree().Root.GetChild(-1);
if (startData is not null) if (startData is not null)
{ {
// Call deferred if it gives issues // Call deferred if it gives issues

3
Scripts/IntroManager.cs
View file

@ -29,7 +29,8 @@ public partial class IntroManager : Node
private void DialogueEndAction() private void DialogueEndAction()
{ {
GetTree().ChangeSceneToFile(NextMap); GlobalState.Instance.GotoScene(NextMap);
//GetTree().ChangeSceneToFile(NextMap);
} }
} }

3
Scripts/MainMenu.cs
View file

@ -31,7 +31,8 @@ public partial class MainMenu : Control
private void _on_start_button_pressed() private void _on_start_button_pressed()
{ {
if (GameScene != null) { if (GameScene != null) {
GetTree().ChangeSceneToFile(GameScene); GlobalState.Instance.GotoScene(GameScene);
//GetTree().ChangeSceneToFile(GameScene);
} }
} }

3
Scripts/UI/IntroScenePlayer.cs
View file

@ -82,7 +82,8 @@ public partial class IntroScenePlayer : CanvasLayer
private void Finished() private void Finished()
{ {
GetTree().ChangeSceneToFile(NextSceneName); GlobalState.Instance.GotoScene(NextSceneName);
//GetTree().ChangeSceneToFile(NextSceneName);
} }
private async Task Transition() private async Task Transition()

3
Scripts/UI/PauseMenu.cs
View file

@ -47,6 +47,7 @@ public partial class PauseMenu : Control
private void QuitButtonOnPressed() private void QuitButtonOnPressed()
{ {
GetTree().ChangeSceneToFile(MainMenuScene); GlobalState.Instance.GotoScene(MainMenuScene);
//GetTree().ChangeSceneToFile(MainMenuScene);
} }
} }