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

Move the init of leaders and genders list from mp::connect to mp::ui.

Browse source
This commit is contained in:
Andrius Silinskas 2013-08-08 15:35:26 +01:00
parent f7fa3c59b5
commit b28a1fb6ab
4 changed files with 139 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
src/multiplayer_connect_engine.cpp
View file

@ -1243,119 +1243,16 @@ void side_engine::set_ai_algorithm_commandline(
void side_engine::update_choosable_leaders()
{
choosable_leaders_.clear();
if (parent_.params_.saved_game) {
// Leader should be determined from savegame data.
// TODO: find a proper way to determine
// a leader from a savegame.
std::string leader;
BOOST_FOREACH(const config& side_unit, cfg_.child_range("unit")) {
if (side_unit["canrecruit"].to_bool()) {
leader = side_unit["type"].str();
break;
}
}
if (!leader.empty()) {
const unit_type *unit = unit_types.find(leader);
if (unit) {
choosable_leaders_.push_back(leader);
}
}
} else {
if (parent_.params_.use_map_settings &&
cfg_.has_attribute("type")) {
// Leader was explicitly assigned.
const unit_type *unit = unit_types.find(cfg_["type"]);
if (unit) {
choosable_leaders_.push_back(cfg_["type"]);
}
} else if ((*current_faction_)["id"] == "Custom") {
// Allow user to choose a leader from any faction.
choosable_leaders_.push_back("random");
BOOST_FOREACH(const config* faction, available_factions_) {
if ((*faction)["id"] != "Random") {
append_leaders_from_faction(faction);
}
}
} else if ((*current_faction_)["id"] != "Random") {
// Faction leader list consists of "random" + "leader=".
choosable_leaders_.push_back("random");
append_leaders_from_faction(current_faction_);
}
}
// If none of the possible leaders could be determined,
// use "null" as an indicator for empty leaders list.
if (choosable_leaders_.empty()) {
choosable_leaders_.push_back("null");
}
choosable_leaders_ = init_choosable_leaders(cfg_, current_faction_,
available_factions_, parent_.params_.use_map_settings,
parent_.params_.saved_game);
}
void side_engine::update_choosable_genders()
{
choosable_genders_.clear();
if (parent_.params_.saved_game) {
std::string gender;
BOOST_FOREACH(const config& side_unit, cfg_.child_range("unit")) {
if (current_leader_ == side_unit["type"] &&
side_unit["canrecruit"].to_bool()) {
gender = side_unit["gender"].str();
break;
}
}
if (!gender.empty()) {
choosable_genders_.push_back(gender);
}
} else {
const unit_type* unit = unit_types.find(current_leader_);
if (unit) {
if (parent_.params_.use_map_settings &&
cfg_.has_attribute("type") &&
cfg_.has_attribute("gender")) {
// Gender was explicitly assigned.
const unit_type *unit = unit_types.find(current_leader_);
if (unit) {
BOOST_FOREACH(unit_race::GENDER gender, unit->genders()) {
if (cfg_["gender"] == gender) {
choosable_genders_.push_back(cfg_["gender"]);
}
}
}
} else {
if (unit->genders().size() > 1) {
choosable_genders_.push_back("random");
}
BOOST_FOREACH(unit_race::GENDER gender, unit->genders()) {
if (gender == unit_race::FEMALE) {
choosable_genders_.push_back(unit_race::s_female);
} else {
choosable_genders_.push_back(unit_race::s_male);
}
}
}
}
}
// If none of the possible genders could be determined,
// use "null" as an indicator for empty genders list.
if (choosable_genders_.empty()) {
choosable_genders_.push_back("null");
}
}
void side_engine::append_leaders_from_faction(const config* faction)
{
const std::vector<std::string>& leaders =
utils::split((*faction)["leader"]);
choosable_leaders_.insert(choosable_leaders_.end(), leaders.begin(),
leaders.end());
choosable_genders_ = init_choosable_genders(cfg_, current_leader_,
parent_.params_.use_map_settings, parent_.params_.saved_game);
}
} // end namespace mp

1
src/multiplayer_connect_engine.hpp
View file

@ -203,7 +203,6 @@ private:
void update_choosable_leaders();
void update_choosable_genders();
void append_leaders_from_faction(const config* faction);
config cfg_;
connect_engine& parent_;

123
src/multiplayer_ui.cpp
View file

@ -912,4 +912,127 @@ std::vector<const config*> init_choosable_factions(
return choosable_factions;
}
std::vector<std::string> init_choosable_leaders(const config& side,
const config* faction, const std::vector<const config*> available_factions,
const bool map_settings, const bool saved_game)
{
std::vector<std::string> choosable_leaders;
if (saved_game) {
// TODO: find a proper way to determine
// a leader from a savegame.
std::string leader;
BOOST_FOREACH(const config& side_unit, side.child_range("unit")) {
if (side_unit["canrecruit"].to_bool()) {
leader = side_unit["type"].str();
break;
}
}
if (!leader.empty()) {
const unit_type *unit = unit_types.find(leader);
if (unit) {
choosable_leaders.push_back(leader);
}
}
} else {
if (map_settings && side.has_attribute("type")) {
// Leader was explicitly assigned.
const unit_type *unit = unit_types.find(side["type"]);
if (unit) {
choosable_leaders.push_back(side["type"]);
}
} else if ((*faction)["id"] == "Custom") {
// Allow user to choose a leader from any faction.
choosable_leaders.push_back("random");
BOOST_FOREACH(const config* f, available_factions) {
if ((*f)["id"] != "Random") {
append_leaders_from_faction(f, choosable_leaders);
}
}
} else if ((*faction)["id"] != "Random") {
// Faction leader list consists of "random" + "leader=".
choosable_leaders.push_back("random");
append_leaders_from_faction(faction, choosable_leaders);
}
}
// If none of the possible leaders could be determined,
// use "null" as an indicator for empty leaders list.
if (choosable_leaders.empty()) {
choosable_leaders.push_back("null");
}
return choosable_leaders;
}
std::vector<std::string> init_choosable_genders(const config& side,
const std::string& leader, const bool map_settings, const bool saved_game)
{
std::vector<std::string> choosable_genders;
if (saved_game) {
std::string gender;
BOOST_FOREACH(const config& side_unit, side.child_range("unit")) {
if (leader == side_unit["type"] &&
side_unit["canrecruit"].to_bool()) {
gender = side_unit["gender"].str();
break;
}
}
if (!gender.empty()) {
choosable_genders.push_back(gender);
}
} else {
const unit_type* unit = unit_types.find(leader);
if (unit) {
if (map_settings && side.has_attribute("type") &&
side.has_attribute("gender")) {
// Gender was explicitly assigned.
const unit_type *unit = unit_types.find(leader);
if (unit) {
BOOST_FOREACH(unit_race::GENDER gender, unit->genders()) {
if (side["gender"] == gender) {
choosable_genders.push_back(side["gender"]);
}
}
}
} else {
if (unit->genders().size() > 1) {
choosable_genders.push_back("random");
}
BOOST_FOREACH(unit_race::GENDER gender, unit->genders()) {
if (gender == unit_race::FEMALE) {
choosable_genders.push_back(unit_race::s_female);
} else {
choosable_genders.push_back(unit_race::s_male);
}
}
}
}
}
// If none of the possible genders could be determined,
// use "null" as an indicator for empty genders list.
if (choosable_genders.empty()) {
choosable_genders.push_back("null");
}
return choosable_genders;
}
void append_leaders_from_faction(const config* faction,
std::vector<std::string>& leaders)
{
const std::vector<std::string>& leaders_to_append =
utils::split((*faction)["leader"]);
leaders.insert(leaders.end(), leaders_to_append.begin(),
leaders_to_append.end());
}
}// namespace mp

11
src/multiplayer_ui.hpp
View file

@ -280,6 +280,17 @@ std::vector<const config*> init_available_factions(
std::vector<const config*> init_choosable_factions(
std::vector<const config*> available_factions, const config& side,
const bool map_settings);
std::vector<std::string> init_choosable_leaders(const config& side,
const config* faction, const std::vector<const config*> available_factions,
const bool map_settings, const bool saved_game);
std::vector<std::string> init_choosable_genders(const config& side,
const std::string& leader, const bool map_settings, const bool saved_game);
void append_leaders_from_faction(const config* faction,
std::vector<std::string>& leaders);
}
#endif