From 5c24213092338cd402206927b12e36909eb44f06 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Wed, 13 Dec 2023 21:34:54 +0100
Subject: [PATCH] fixed restoring golems in casual

---
 quit.cpp   |  1 +
 system.cpp | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/quit.cpp b/quit.cpp
index 828e9c8d..90faacb2 100644
--- a/quit.cpp
+++ b/quit.cpp
@@ -615,6 +615,7 @@ EX void handleKeyQuit(int sym, int uni) {
       stop_game();
       load_last_save();
       start_game();
+      restore_all_golems();
       }
     else
       gotoHelp(safety_help());
diff --git a/system.cpp b/system.cpp
index 2f683303..ac82c737 100644
--- a/system.cpp
+++ b/system.cpp
@@ -1714,6 +1714,15 @@ EX void progress_warning() {
     addMessage(XLAT("Your progress will not be saved."));
   }
 
+EX void restore_all_golems() {
+  if(!shmup::on) {
+    restoreGolems(items[itOrbLife], moGolem); items[itOrbLife] = 0;
+    restoreGolems(items[itOrbFriend], moTameBomberbird); items[itOrbFriend] = 0;
+    restoreGolems(kills[moPrincessMoved], moPrincess, princess::saveHP); kills[moPrincessMoved] = 0;
+    restoreGolems(kills[moPrincessArmedMoved], moPrincessArmed, princess::saveArmedHP); kills[moPrincessArmedMoved] = 0;
+    }
+  }
+
 EX void initAll() {
   callhooks(hooks_initialize);
   init_floorcolors();
@@ -1738,13 +1747,7 @@ EX void initAll() {
   if(IRREGULAR) irr::auto_creator();
 #endif
   start_game();
-  
-  if(!shmup::on) {
-    restoreGolems(items[itOrbLife], moGolem); items[itOrbLife] = 0;
-    restoreGolems(items[itOrbFriend], moTameBomberbird); items[itOrbFriend] = 0;
-    restoreGolems(kills[moPrincessMoved], moPrincess, princess::saveHP); kills[moPrincessMoved] = 0;
-    restoreGolems(kills[moPrincessArmedMoved], moPrincessArmed, princess::saveArmedHP); kills[moPrincessArmedMoved] = 0;
-    }
+  restore_all_golems();
   
   firstland = firstland0;
   polygonal::solve();