diff --git a/src/game/boe.fileio.cpp b/src/game/boe.fileio.cpp index 9c319055..7cfceb4e 100644 --- a/src/game/boe.fileio.cpp +++ b/src/game/boe.fileio.cpp @@ -57,12 +57,11 @@ cCustomGraphics spec_scen_g; void finish_load_party(){ bool town_restore = univ.party.town_num < 200; - bool in_scen = univ.party.scen_name.length() > 0; party_in_memory = true; // now if not in scen, this is it. - if(!in_scen) { + if(!univ.party.is_in_scenario()) { if(overall_mode != MODE_STARTUP) { reload_startup(); draw_startup(0); diff --git a/src/universe/party.cpp b/src/universe/party.cpp index bad4a811..d65a032f 100644 --- a/src/universe/party.cpp +++ b/src/universe/party.cpp @@ -437,6 +437,10 @@ void cParty::clear_bad_status() { adven[i]->clear_bad_status(); } +bool cParty::is_in_scenario() const { + return !scen_name.empty(); +} + bool cParty::is_alive() const { for(int i = 0; i < 6; i++) if(adven[i]->is_alive()) diff --git a/src/universe/party.hpp b/src/universe/party.hpp index 5c7d8a45..cba72a1a 100644 --- a/src/universe/party.hpp +++ b/src/universe/party.hpp @@ -155,6 +155,7 @@ public: void import_legacy(legacy::setup_save_type& old); void import_legacy(legacy::pc_record_type(& old)[6]); + bool is_in_scenario() const; bool is_alive() const; bool is_friendly() const; bool is_friendly(const iLiving& other) const;