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

Ensured that the AI algorithm set in an [ai] tag is preferred when it exists.

Browse source
This commit is contained in:
Guillaume Melquiond 2010-12-26 08:05:41 +00:00
parent e008466432
commit d5e081efb2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/multiplayer_connect.cpp
View file

@ -170,12 +170,8 @@ connect::side::side(connect& parent, const config& cfg, int index) :
update_faction_combo();
if (!parent_->ai_algorithms_.empty())
ai_algorithm_ = parent_->ai_algorithms_[0]->id;
else if (const config &ai = cfg.child("ai"))
if (const config &ai = cfg.child("ai"))
ai_algorithm_ = ai["ai_algorithm"].str();
else
ai_algorithm_ = "default";
init_ai_algorithm_combo();
// "Faction name" hack
@ -588,6 +584,10 @@ void connect::side::init_ai_algorithm_combo()
}
combo_ai_algorithm_.set_items(ais);
combo_ai_algorithm_.set_selected(sel);
if (!ais_list.empty()) {
// Ensures that the visually selected AI is the one that will be loaded.
ai_algorithm_ = ais_list[sel]->id;
}
}
void connect::side::update_faction_combo()