cboe: try to reset end_scenario to false correctly...
This commit is contained in:
@@ -23,7 +23,6 @@
|
||||
|
||||
#define DONE_BUTTON_ITEM 1
|
||||
|
||||
extern bool end_scenario;
|
||||
extern eStatMode stat_screen_mode;
|
||||
extern eGameMode overall_mode;
|
||||
extern bool party_in_memory;
|
||||
@@ -60,7 +59,6 @@ void finish_load_party(){
|
||||
bool town_restore = univ.party.town_num < 200;
|
||||
bool in_scen = univ.party.scen_name.length() > 0;
|
||||
|
||||
end_scenario = false;
|
||||
party_in_memory = true;
|
||||
|
||||
// now if not in scen, this is it.
|
||||
|
@@ -57,6 +57,7 @@ extern eSpecCtxType spec_target_type;
|
||||
extern short spec_target_fail, spec_target_options;
|
||||
bool spell_button_active[90];
|
||||
|
||||
extern bool end_scenario;
|
||||
extern short fast_bang;
|
||||
extern bool flushingInput;
|
||||
extern eItemWinMode stat_window;
|
||||
@@ -151,9 +152,9 @@ void put_party_in_scen(std::string scen_name) {
|
||||
return;
|
||||
}
|
||||
set_cursor(watch_curs);
|
||||
end_scenario=false;
|
||||
if(!load_scenario(path, univ.scenario))
|
||||
return;
|
||||
|
||||
bool stored_item = false;
|
||||
for(auto& store : univ.party.stored_items)
|
||||
stored_item = stored_item || std::any_of(store.begin(), store.end(), [](const cItem& item) {
|
||||
|
Reference in New Issue
Block a user