Split responsibility into different booleans

Author: AlexandreSi

GDJS/Runtime/runtimegame.ts

@@ -1391,7 +1391,7 @@ namespace gdjs {
       if (syncData.ss) {
         this._sceneStack.updateFromNetworkSyncData(syncData.ss);
       }
-      if (options.clearMemory && syncData.sm) {
+      if (options.syncSounds && syncData.sm) {
         this.getSoundManager().updateFromNetworkSyncData(syncData.sm);
       }
       if (syncData.extVar) {

GDJS/Runtime/runtimescene.ts

@@ -127,7 +127,10 @@ namespace gdjs {
      */
     loadFromScene(
       sceneAndExtensionsData: SceneAndExtensionsData | null,
-      options?: UpdateFromNetworkSyncDataOptions
+      options?: {
+        preventInitialInstancesCreation: boolean;
+        preventSoundManagerClearing: boolean;
+      }
     ) {
       if (!sceneAndExtensionsData) {
         logger.error('loadFromScene was called without a scene');
@@ -186,7 +189,7 @@ namespace gdjs {
       }
 
       // Create initial instances of objects
-      if (!options || !options.clearMemory)
+      if (!options || !options.preventInitialInstancesCreation)
         this.createObjectsFrom(
           sceneData.instances,
           0,
@@ -215,7 +218,7 @@ namespace gdjs {
       if (
         sceneData.stopSoundsOnStartup &&
         this._runtimeGame &&
-        (!options || !options.clearMemory)
+        (!options || !options.preventSoundManagerClearing)
       ) {
         this._runtimeGame.getSoundManager().clearAll();
       }
@@ -885,7 +888,7 @@ namespace gdjs {
           }
         }
       }
-      if (syncData.timeManager && options.clearMemory) {
+      if (syncData.timeManager && options.syncTimers) {
         this._timeManager.updateFromNetworkSyncData(syncData.timeManager);
       }
     }

GDJS/Runtime/scenestack.ts

@@ -38,6 +38,9 @@ namespace gdjs {
       const options: UpdateFromNetworkSyncDataOptions = {
         clearMemory: true,
         keepControl: true,
+        syncSounds: true,
+        syncTimers: true,
+        ignoreVariableOwnership: true,
       };
 
       this._runtimeGame.updateFromNetworkSyncData(
@@ -202,40 +205,42 @@ namespace gdjs {
       // Avoid a risk of displaying an intermediate loading screen
       // during 1 frame.
       if (this._runtimeGame.areSceneAssetsReady(newSceneName)) {
-        return this._loadNewScene(
-          newSceneName,
-          options || {},
-          externalLayoutName
-        );
+        return this._loadNewScene(newSceneName, externalLayoutName, options);
       }
 
       this._isNextLayoutLoading = true;
       this._runtimeGame.loadSceneAssets(newSceneName).then(() => {
-        this._loadNewScene(newSceneName, options || {}, undefined);
+        this._loadNewScene(newSceneName, undefined, options);
         this._isNextLayoutLoading = false;
       });
       return null;
     }
 
     private _loadNewScene(
       newSceneName: string,
-      options: UpdateFromNetworkSyncDataOptions,
-      externalLayoutName?: string
+      externalLayoutName?: string,
+      options?: UpdateFromNetworkSyncDataOptions
     ): gdjs.RuntimeScene {
       this._throwIfDisposed();
+      const preventInitialInstancesCreation = !!options;
+      const preventSoundManagerClearing = !!options;
+
       // Load the new one
       const newScene = new gdjs.RuntimeScene(this._runtimeGame);
       newScene.loadFromScene(
         this._runtimeGame.getSceneAndExtensionsData(newSceneName),
-        options
+        {
+          preventInitialInstancesCreation,
+          preventSoundManagerClearing,
+        }
       );
       this._wasFirstSceneLoaded = true;
 
       // Optionally create the objects from an external layout.
       if (externalLayoutName) {
         const externalLayoutData =
           this._runtimeGame.getExternalLayoutData(externalLayoutName);
-        if (externalLayoutData && !options.clearMemory) {
+        if (externalLayoutData && !preventInitialInstancesCreation) {
           newScene.createObjectsFrom(
             externalLayoutData.instances,
             0,

GDJS/Runtime/types/project-data.d.ts

@@ -47,7 +47,10 @@ declare type GetNetworkSyncDataOptions = {
 
 declare type UpdateFromNetworkSyncDataOptions = {
   clearMemory?: boolean;
+  syncSounds?: boolean;
+  syncTimers?: boolean;
   keepControl?: boolean;
+  ignoreVariableOwnership?: boolean;
 };
 
 /** Object containing basic properties for all objects synchronizing over the network. */

GDJS/Runtime/variablescontainer.ts

@@ -374,7 +374,7 @@ namespace gdjs {
         // - If we are not the owner of the variable, then assume that we missed the ownership change message, so update the variable's
         //   ownership and then update the variable.
         const syncedVariableOwner = variableSyncData.owner;
-        if (!options.clearMemory) {
+        if (!options.ignoreVariableOwnership) {
           const currentPlayerNumber = gdjs.multiplayer.getCurrentPlayerNumber();
 
           const currentVariableOwner = variable.getPlayerOwnership();