save end tweak for render order

Franisz · Dec 11, 2021 · 0f13685 · 0f13685
1 parent 8668e53
commit 0f13685
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/zUtilities/Plugin.cpp b/zUtilities/Plugin.cpp
@@ -48,7 +48,7 @@ namespace GOTHIC_ENGINE {
   }
 
   void Game_SaveEnd() {
-    quickSave->EndSaveLoad();
+    quickSave->saveEnd = true;
     playerStatus.Archive();
   }
 

diff --git a/zUtilities/QuickSave.cpp b/zUtilities/QuickSave.cpp
@@ -129,16 +129,16 @@ namespace GOTHIC_ENGINE {
   void QuickSave::EndSaveLoad() {
     isSaving = false;
     isLoading = false;
+    saveEnd = false;
 
     if ( disabledStatus ) {
       disabledStatus = false;
       ogame->SetShowPlayerStatus( true );
-      playerStatus.Loop();
     }
   }
 
   void QuickSave::Loop() {
-    if ( isLoading && !ogame->IsOnPause() )
+    if ( (isLoading && !ogame->IsOnPause()) || (isSaving && saveEnd) )
       EndSaveLoad();
 
     if ( !Options::UseQuickSave ) return;

diff --git a/zUtilities/QuickSave.h b/zUtilities/QuickSave.h
@@ -72,6 +72,7 @@ namespace GOTHIC_ENGINE {
     void StartSaveLoad();
 
   public:
+    bool saveEnd = false;
     bool isSaving = false;
     bool isLoading = false;
     void EndSaveLoad();