fixed restoring golems in casual
This commit is contained in:
parent
a282ac314e
commit
5c24213092
1
quit.cpp
1
quit.cpp
|
@ -615,6 +615,7 @@ EX void handleKeyQuit(int sym, int uni) {
|
||||||
stop_game();
|
stop_game();
|
||||||
load_last_save();
|
load_last_save();
|
||||||
start_game();
|
start_game();
|
||||||
|
restore_all_golems();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
gotoHelp(safety_help());
|
gotoHelp(safety_help());
|
||||||
|
|
17
system.cpp
17
system.cpp
|
@ -1714,6 +1714,15 @@ EX void progress_warning() {
|
||||||
addMessage(XLAT("Your progress will not be saved."));
|
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() {
|
EX void initAll() {
|
||||||
callhooks(hooks_initialize);
|
callhooks(hooks_initialize);
|
||||||
init_floorcolors();
|
init_floorcolors();
|
||||||
|
@ -1738,13 +1747,7 @@ EX void initAll() {
|
||||||
if(IRREGULAR) irr::auto_creator();
|
if(IRREGULAR) irr::auto_creator();
|
||||||
#endif
|
#endif
|
||||||
start_game();
|
start_game();
|
||||||
|
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
firstland = firstland0;
|
firstland = firstland0;
|
||||||
polygonal::solve();
|
polygonal::solve();
|
||||||
|
|
Loading…
Reference in New Issue