SaveMenu is now a singleton game object. SaveGameObjects manages mapping to saveable game objects.

Assets/Fungus/Scripts/Components/SaveGameObjects.cs

@@ -0,0 +1,25 @@
+using UnityEngine;
+using System.Collections.Generic;
+
+namespace Fungus
+{
+    [System.Serializable]
+    public class SaveGameObjects : MonoBehaviour
+    {
+        [SerializeField] protected List<Flowchart> flowcharts = new List<Flowchart>();
+
+        #region Public methods
+
+        public void Encode(SavePointData savePointData)
+        {
+            for (int i = 0; i < flowcharts.Count; i++)
+            {
+                var flowchart = flowcharts[i];
+                var flowchartData = FlowchartData.Encode(flowchart);
+                savePointData.FlowchartDatas.Add(flowchartData);
+            }
+        }
+
+        #endregion
+    }
+}

Assets/Fungus/Scripts/Components/SaveManager.cs

@@ -53,6 +53,7 @@ namespace Fungus
         {
             if (ReadSaveHistory(saveDataKey))
             {
+                saveHistory.ClearRewoundSavePoints();
                 saveHistory.LoadLatestSavePoint();
 
                 SaveManagerSignals.DoGameLoaded(saveDataKey);

Assets/Fungus/Scripts/Components/SaveMenu.cs

@@ -6,18 +6,14 @@ using UnityEngine.SceneManagement;
 
 namespace Fungus
 {
-    public class SaveGameHelper : MonoBehaviour 
+    public class SaveMenu : MonoBehaviour 
     {
         const string SaveDataKey = "save_data";
 
         const string NewGameSavePointKey = "new_game";
 
-        [SerializeField] protected string startScene = "";
-
         [SerializeField] protected bool autoStartGame = true;
 
-        [SerializeField] protected bool saveMenuActive = false;
-
         [SerializeField] protected bool restartDeletesSave = false;
 
         [SerializeField] protected CanvasGroup saveMenuGroup;
@@ -34,19 +30,36 @@ namespace Fungus
 
         [SerializeField] protected Button restartButton;
 
-        [SerializeField] protected SaveGameObjects saveGameObjects = new SaveGameObjects();
+        protected static bool saveMenuActive = false;
 
         protected AudioSource clickAudioSource;
 
         protected LTDescr fadeTween;
 
+        protected static SaveMenu instance;
+
+        protected string startScene = "";
+
         protected virtual void Awake()
         {
+            // Only one instance of SaveMenu may exist
+            if (instance != null)
+            {
+                Destroy(gameObject);
+                return;
+            }
+
+            instance = this;
+
+            GameObject.DontDestroyOnLoad(this);
+
             clickAudioSource = GetComponent<AudioSource>();
         }
 
         protected virtual void Start()
         {
+            startScene = SceneManager.GetActiveScene().name;
+
             var saveManager = FungusManager.Instance.SaveManager;
 
             if (!saveMenuActive)
@@ -87,6 +100,9 @@ namespace Fungus
             }
         }
 
+        /// <summary>
+        /// Warn if duplicate SavePointKeys are found.
+        /// </summary>
         protected void CheckSavePointKeys()
         {
             List<string> keys = new List<string>();
@@ -119,15 +135,27 @@ namespace Fungus
             }
         }
 
-        #region Public methods
+        /// <summary>
+        /// Callback for restart scene load
+        /// </summary>
+        protected void OnSceneLoaded(Scene scene, LoadSceneMode mode)
+        {
+            if (scene.name != startScene)
+            {
+                return;
+            }
 
-        public SaveGameObjects SaveGameObjects { get { return saveGameObjects; } }
+            SceneManager.sceneLoaded -= OnSceneLoaded;
+            SavePointLoaded.NotifyEventHandlers(NewGameSavePointKey);
+        }
+
+        #region Public methods
 
         public virtual void ToggleSaveMenu()
         {
             if (fadeTween != null)
             {
-                LeanTween.cancel(fadeTween.id);
+                LeanTween.cancel(fadeTween.id, true);
                 fadeTween = null;
             }
 
@@ -136,6 +164,8 @@ namespace Fungus
                 // Switch menu off
                 LeanTween.value(saveMenuGroup.gameObject, saveMenuGroup.alpha, 0f, 0.5f).setOnUpdate( (t) => { 
                     saveMenuGroup.alpha = t;
+                }).setOnComplete( () => {
+                    saveMenuGroup.alpha = 0f;
                 });
             }
             else
@@ -143,6 +173,8 @@ namespace Fungus
                 // Switch menu on
                 LeanTween.value(saveMenuGroup.gameObject, saveMenuGroup.alpha, 1f, 0.5f).setOnUpdate( (t) => { 
                     saveMenuGroup.alpha = t;
+                }).setOnComplete( () => {
+                    saveMenuGroup.alpha = 1f;
                 });
             }
 
@@ -211,16 +243,10 @@ namespace Fungus
                 saveManager.Delete(SaveDataKey);
             }
 
+            SceneManager.sceneLoaded += OnSceneLoaded;
             SceneManager.LoadScene(startScene);
         }
 
-        public virtual void LoadScene(string sceneName)
-        {
-            PlayClickSound();
-
-            SceneManager.LoadScene(sceneName);
-        }
-
         #endregion
     }
 }

Assets/Fungus/Scripts/SavePoints/SaveGameObjects.cs

@@ -1,17 +0,0 @@
-using UnityEngine;
-using System.Collections.Generic;
-
-namespace Fungus
-{
-    [System.Serializable]
-    public class SaveGameObjects
-    {
-        [SerializeField] protected List<Flowchart> flowcharts = new List<Flowchart>();
-
-        #region Public methods
-
-        public List<Flowchart> Flowcharts { get { return flowcharts; } }
-
-        #endregion
-    }
-}

Assets/Fungus/Scripts/SavePoints/SaveHistory.cs

@@ -62,6 +62,12 @@ namespace Fungus
         public void Clear()
         {
             savePoints.Clear();
+            rewoundSavePoints.Clear();
+        }
+
+        public void ClearRewoundSavePoints()
+        {
+            rewoundSavePoints.Clear();
         }
 
         #endregion

Assets/Fungus/Scripts/SavePoints/SavePointData.cs

@@ -88,29 +88,18 @@ namespace Fungus
         public string SceneName { get { return sceneName; } set { sceneName = value; } }
         public List<FlowchartData> FlowchartDatas { get { return flowchartDatas; } set { flowchartDatas = value; } }
 
-        public static string EncodeNewGame(string _description, string _sceneName)
-        {
-            var savePointData = Create("start_game", _description, _sceneName);
-
-            return JsonUtility.ToJson(savePointData, true);
-        }
-
         public static string Encode(string _savePointKey, string _savePointDescription, string _sceneName)
         {
             var savePointData = Create(_savePointKey, _savePointDescription, _sceneName);
                 
-            var saveGameHelper = GameObject.FindObjectOfType<SaveGameHelper>();
-            if (saveGameHelper == null)
+            var saveGameObjects = GameObject.FindObjectOfType<SaveGameObjects>();
+            if (saveGameObjects == null)
             {
-                Debug.LogError("Failed to find SaveGameHelper object in scene");
-                return null;
+                Debug.LogWarning("Failed to find a SaveGameObjects in current scene");
             }
-
-            for (int i = 0; i < saveGameHelper.SaveGameObjects.Flowcharts.Count; i++)
+            else
             {
-                var flowchart = saveGameHelper.SaveGameObjects.Flowcharts[i];
-                var flowchartData = FlowchartData.Encode(flowchart);
-                savePointData.FlowchartDatas.Add(flowchartData);
+                saveGameObjects.Encode(savePointData);
             }
 
             return JsonUtility.ToJson(savePointData, true);

Assets/FungusExamples/SaveGame/SaveMenu.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: ac03b2b3b2c07411da18c6ddc7c6e9ec
-timeCreated: 1479485548
+guid: bd2b99773f3e0489aae9f9b5053ad360
+timeCreated: 1481298777
 licenseType: Free
 NativeFormatImporter:
   userData: