Clean up and fix save-load code

SamboyCoding · Jul 21, 2021 · 11f12c4 · 11f12c4
1 parent 1d4c79c
commit 11f12c4
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/1.1-1.2/Assemblies/BetterLoading.dll b/1.1-1.2/Assemblies/BetterLoading.dll
diff --git a/1.3/Assemblies/BetterLoading.dll b/1.3/Assemblies/BetterLoading.dll
diff --git a/Source/Stage/SaveLoad/1LoadWorldMap.cs b/Source/Stage/SaveLoad/1LoadWorldMap.cs
@@ -11,9 +11,7 @@ public class LoadWorldMap : LoadingStage
         private static bool _hasLoadedWorldFromFile;
         private static bool _hasFinalizedWorldInit;
         private static bool _loadingGeneratorDataFromFile;
-
-        private static WorldGenStep _currentWorldgenStep;
-        private static int _currentWorldgenStepNum;
+
         private static int _numWorldgenSteps;
 
         public LoadWorldMap([NotNull] Harmony instance) : base(instance)

diff --git a/Source/Stage/SaveLoad/2LoadMaps.cs b/Source/Stage/SaveLoad/2LoadMaps.cs
@@ -93,6 +93,7 @@ public override bool IsCompleted()
         public override void BecomeInactive()
         {
             _allMapsLoaded = false;
+            _currMapNum = -1;
         }
 
         public override void DoPatching(Harmony instance)

diff --git a/Source/Stage/SaveLoad/4SpawnAllThings.cs b/Source/Stage/SaveLoad/4SpawnAllThings.cs
@@ -49,7 +49,7 @@ public override bool IsCompleted()
         public override void BecomeInactive()
         {
             _finished = false;
-            _currMapIdx = 0;
+            _currMapIdx = -1;
             _numThingsThisMapSoFar = 0;
         }