0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

f p

Browse source
This commit is contained in:
gfgtdf 2024-12-26 00:52:50 +01:00
parent a10d083c99
commit df764e94ca
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game_initialization/flg_manager.cpp
View file

@ -56,13 +56,13 @@ flg_manager::flg_manager(const std::vector<const config*>& era_factions,
, default_leader_gender_("") , default_leader_gender_("")
{ {
std::string leader_id = side["id"]; std::string leader_id = side["id"];
const config* cfg_leader; bool found_leader;
leader_lock_ = leader_lock_ && (use_map_settings || lock_settings || default_leader_type_.empty()); leader_lock_ = leader_lock_ && (use_map_settings || lock_settings || default_leader_type_.empty());
faction_lock_ = faction_lock_ && (use_map_settings || lock_settings); faction_lock_ = faction_lock_ && (use_map_settings || lock_settings);
auto set_leader = [&](const config& cfg) { auto set_leader = [&](const config& cfg) {
cfg_leader = &cfg; found_leader = true;
leader_id = cfg["id"]; leader_id = cfg["id"];
default_leader_type_ = cfg["type"]; default_leader_type_ = cfg["type"];
default_leader_gender_ = cfg["gender"]; default_leader_gender_ = cfg["gender"];
@ -88,7 +88,7 @@ flg_manager::flg_manager(const std::vector<const config*>& era_factions,
} }
} }
if(!cfg_leader) { if(!found_leader) {
// Find a unit which can recruit. // Find a unit which can recruit.
if(auto p_cfg = side.find_child("unit", "canrecruit", "yes")) { if(auto p_cfg = side.find_child("unit", "canrecruit", "yes")) {
set_leader(*p_cfg); set_leader(*p_cfg);

1
src/saved_game.cpp
View file

@ -270,6 +270,7 @@ void saved_game::set_defaults()
side.remove_attribute(attr); side.remove_attribute(attr);
} }
} }
temp["side"] = side["side"];
temp.swap(side); temp.swap(side);
temp.swap(side.add_child_at("leader", config(), 0)); temp.swap(side.add_child_at("leader", config(), 0));
} }