From 1f330911cc5772bfe735a17371ef18104baad281 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Tue, 5 Aug 2025 22:04:51 +0000 Subject: [PATCH] Update scene loading to use SceneLoadingOptions and Game.ChangeScene Co-authored-by: nolandimensions --- code/GameSystem/GameSystem.cs | 4 +++- code/MapSystem/MapGameObjectSystem.cs | 17 ++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/code/GameSystem/GameSystem.cs b/code/GameSystem/GameSystem.cs index 21375da..f9062af 100644 --- a/code/GameSystem/GameSystem.cs +++ b/code/GameSystem/GameSystem.cs @@ -314,7 +314,9 @@ protected override void OnFixedUpdate() { Log.Info( $"Map {selectedMap.ResourceName} won the vote" ); - Scene.Load( selectedMap.Scene ); + var sceneLoadingOptions = new SceneLoadingOptions(); + sceneLoadingOptions.SetScene( selectedMap.Scene ); + Game.ChangeScene( sceneLoadingOptions ); } } } diff --git a/code/MapSystem/MapGameObjectSystem.cs b/code/MapSystem/MapGameObjectSystem.cs index 5fdb3e1..8cc2cfc 100644 --- a/code/MapSystem/MapGameObjectSystem.cs +++ b/code/MapSystem/MapGameObjectSystem.cs @@ -140,7 +140,9 @@ public static void StartGame() GameSystem.SavedGameMode = CurrentGamemode; - Game.ActiveScene.Load( CurrentMap.Scene ); + var sceneLoadingOptions = new SceneLoadingOptions(); + sceneLoadingOptions.SetScene( CurrentMap.Scene ); + Game.ChangeScene( sceneLoadingOptions ); } public void LoadAdditiveScene( SceneFile mainScene, SceneFile additiveScene ) @@ -148,13 +150,14 @@ public void LoadAdditiveScene( SceneFile mainScene, SceneFile additiveScene ) if ( Scene.IsEditor ) return; - Scene.Load( mainScene ); + var mainSceneOptions = new SceneLoadingOptions(); + mainSceneOptions.SetScene( mainScene ); + Game.ChangeScene( mainSceneOptions ); - var slo = new SceneLoadOptions(); - slo.IsAdditive = true; - slo.SetScene( additiveScene ); - - Scene.Load( slo ); + var additiveSceneOptions = new SceneLoadingOptions(); + additiveSceneOptions.IsAdditive = true; + additiveSceneOptions.SetScene( additiveScene ); + Game.ChangeScene( additiveSceneOptions ); } }