mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed restoring golems in casual

This commit is contained in:
Zeno Rogue 2023-12-13 21:34:54 +01:00
parent a282ac314e
commit 5c24213092
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
quit.cpp
View File

@ -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());

17
system.cpp
View File

@ -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();