openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

cboe: try to reset end_scenario to false correctly...

Browse Source
This commit is contained in:
Laurent alonso
2020-10-31 10:09:31 +01:00
committed by Celtic Minstrel
parent 1bf43ee01e
commit 3811e5b1c8
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/boe.fileio.cpp
View File

@@ -23,7 +23,6 @@
#define DONE_BUTTON_ITEM 1 #define DONE_BUTTON_ITEM 1
extern bool end_scenario;
extern eStatMode stat_screen_mode; extern eStatMode stat_screen_mode;
extern eGameMode overall_mode; extern eGameMode overall_mode;
extern bool party_in_memory; extern bool party_in_memory;
@@ -60,7 +59,6 @@ void finish_load_party(){
bool town_restore = univ.party.town_num < 200; bool town_restore = univ.party.town_num < 200;
bool in_scen = univ.party.scen_name.length() > 0; bool in_scen = univ.party.scen_name.length() > 0;
end_scenario = false;
party_in_memory = true; party_in_memory = true;
// now if not in scen, this is it. // now if not in scen, this is it.

3
src/game/boe.party.cpp
View File

@@ -57,6 +57,7 @@ extern eSpecCtxType spec_target_type;
extern short spec_target_fail, spec_target_options; extern short spec_target_fail, spec_target_options;
bool spell_button_active[90]; bool spell_button_active[90];
extern bool end_scenario;
extern short fast_bang; extern short fast_bang;
extern bool flushingInput; extern bool flushingInput;
extern eItemWinMode stat_window; extern eItemWinMode stat_window;
@@ -151,9 +152,9 @@ void put_party_in_scen(std::string scen_name) {
return; return;
} }
set_cursor(watch_curs); set_cursor(watch_curs);
end_scenario=false;
if(!load_scenario(path, univ.scenario)) if(!load_scenario(path, univ.scenario))
return; return;
bool stored_item = false; bool stored_item = false;
for(auto& store : univ.party.stored_items) for(auto& store : univ.party.stored_items)
stored_item = stored_item || std::any_of(store.begin(), store.end(), [](const cItem& item) { stored_item = stored_item || std::any_of(store.begin(), store.end(), [](const cItem& item) {