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

Remove no_recruit flag (experimental)

Browse source 
The replacement check should serve the same purpose. If this somehow subtly
breaks something in the future, feel free to revert this.
This commit is contained in:
Charles Dang 2015-12-16 02:31:54 +11:00
parent 65c0df2343
commit 61740fe3c0
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game_initialization/connect_engine.cpp
View file

@ -991,11 +991,7 @@ config side_engine::new_config() const
// Save default "recruit" so that correct faction lists would be
// initialized by flg_manager when the new side config is sent over network.
// In case recruit list was empty, set a flag to indicate that.
res["default_recruit"] = cfg_["recruit"].str();
if (res["default_recruit"].empty()) {
res["no_recruit"] = true;
}
// If the user is allowed to change type, faction, leader etc,
// then import their new values in the config.

2
src/game_initialization/flg_manager.cpp
View file

@ -625,7 +625,7 @@ void flg_manager::set_current_gender(const std::string& gender)
std::vector<std::string> flg_manager::get_original_recruits(const config& cfg)
{
if (cfg["no_recruit"].to_bool()) {
if (cfg["default_recruit"].empty()) {
return std::vector<std::string>();
}
const config::attribute_value& cfg_default_recruit = cfg["default_recruit"];