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

remove [side] leader=

Browse source 
previously the leader= attribute in [side] could be used to
make the engine choose a faction by its leader, similar to how
[side]faction_from_recruit worked.

However this was not documented in the wiki, and the name clash
with the [side][leader] subtag could also cause problems
and is also a litte confusing.

So it was decided to remove it. an alternative approach to fix the
name clash would be to rename it, but i can't think of
real usecases of this feature currently.
This commit is contained in:
gfgtdf 2024-12-18 01:01:25 +01:00
parent 2be41a4f85
commit 5e5fc1db5d
3 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game_initialization/flg_manager.cpp
View file

@ -42,7 +42,6 @@ flg_manager::flg_manager(const std::vector<const config*>& era_factions,
, savegame_gender_()
, original_faction_(get_default_faction(side)["faction"].str())
, original_recruit_(utils::split(get_default_faction(side)["recruit"].str()))
, choose_faction_by_leader_(side["leader"].str())
, saved_game_(saved_game)
, has_no_recruits_(original_recruit_.empty() && side["previous_recruits"].empty())
, faction_lock_(side["faction_lock"].to_bool(lock_settings))
@ -452,10 +451,6 @@ int flg_manager::find_suitable_faction() const
// Choose based on recruit.
find = original_recruit_;
search_field = "recruit";
} else if(!choose_faction_by_leader_.empty()) {
// Choose based on leader.
find.push_back(choose_faction_by_leader_);
search_field = "leader";
} else {
find.push_back("Custom");
search_field = "id";

1
src/game_initialization/flg_manager.hpp
View file

@ -114,7 +114,6 @@ private:
std::string savegame_gender_;
const std::string original_faction_;
const std::vector<std::string> original_recruit_;
const std::string choose_faction_by_leader_;
const bool saved_game_;
const bool has_no_recruits_;

1
src/team.cpp
View file

@ -105,7 +105,6 @@ const std::set<std::string> team::attributes {
"faction_lock",
"gold_lock",
"income_lock",
"leader",
"leader_lock",
"random_leader",
"team_lock",