mirror/sbox-public
1
0
Fork 0
mirror of https://github.com/Facepunch/sbox-public.git synced 2025-12-23 22:48:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Partially revert "Fix additive scenes applying their NavMesh properties" (#3643)

Browse Source 
Apply navmesh overrides from additive scenes, only ignore overrides from system scenes.

For some reason our startup scenes load as additive, so the navmesh settings of the startup scene would have been ignored.

Partially reverts https://github.com/Facepunch/sbox/pull/3555

We could also fully revert it if we want system scenes to be able to override navmesh settings.
This commit is contained in:
Lorenz Junglas
2025-12-18 20:41:36 +01:00
committed by GitHub
parent d5daad537b
commit 3be8514e6d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/Sandbox.Engine/Scene/Scene/Scene.LoadSave.cs
View File

@@ -101,7 +101,7 @@ public partial class Scene : GameObject
if ( sceneFile.SceneProperties is not null ) if ( sceneFile.SceneProperties is not null )
{ {
DeserializeProperties( sceneFile.SceneProperties, options.IsAdditive ); DeserializeProperties( sceneFile.SceneProperties, options.IsSystemScene );
} }
// //
@@ -255,7 +255,7 @@ public partial class Scene : GameObject
return metadata; return metadata;
} }
void DeserializeProperties( JsonObject data, bool isAdditive = false ) void DeserializeProperties( JsonObject data, bool isSystemScene = false )
{ {
var sceneType = Game.TypeLibrary.GetType<Scene>(); var sceneType = Game.TypeLibrary.GetType<Scene>();
Assert.NotNull( sceneType, "Scene type is inaccessible!" ); Assert.NotNull( sceneType, "Scene type is inaccessible!" );
@@ -280,9 +280,9 @@ public partial class Scene : GameObject
} }
// //
// We don't want navmesh to be overwritten in additive loads // We don't want navmesh to be overwritten by system scene loads
// //
if ( !isAdditive ) if ( !isSystemScene )
{ {
NavMesh.Deserialize( data["NavMesh"] as JsonObject ); NavMesh.Deserialize( data["NavMesh"] as JsonObject );
} }