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

GUI2/Campaign Selection: some fixup to laurel selection

Browse source 
* Simplified gold laurel check
* Ensured broze laurel shows if *only* the easiest difficulty has been completed.
This commit is contained in:
Charles Dang 2017-09-12 12:24:53 +11:00
parent 20eb42477c
commit b61a159744
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gui/dialogs/campaign_selection.cpp
View file

@ -296,11 +296,11 @@ void campaign_selection::add_campaign_to_tree(window& window, const config& camp
if(campaign["completed"].to_bool()) {
config::const_child_itors difficulties = campaign.child_range("difficulty");
auto did_complete_at = [&difficulties](config::const_child_iterator i) {
return i == difficulties.end() ? false : (*i)["completed_at"].to_bool();
};
auto did_complete_at = [](const config& c) { return c["completed_at"].to_bool(); };
const bool has_multiple_difficulties = difficulties.size() > 1;
// Check for non-completion on every difficulty save the first.
const bool only_first_completed = difficulties.size() > 1 &&
std::none_of(difficulties.begin() + 1, difficulties.end(), did_complete_at);
/*
* Criteria:
@ -308,14 +308,14 @@ void campaign_selection::add_campaign_to_tree(window& window, const config& camp
* - Use the gold laurel (hardest) for campaigns with only one difficulty OR
* if out of two or more difficulties, the last one has been completed.
*
* - Use the bronze laurel (easiest) if the first difficulty out of two or more
* has been completed.
* - Use the bronze laurel (easiest) only if the first difficulty out of two
* or more has been completed.
*
* - Use the silver laurel otherwise.
*/
if(difficulties.size() == 1 || (has_multiple_difficulties && did_complete_at(difficulties.end() - 1))) {
if(!difficulties.empty() && did_complete_at(difficulties.back())) {
item["label"] = game_config::images::victory_laurel_hardest;
} else if(has_multiple_difficulties && did_complete_at(difficulties.begin())) {
} else if(only_first_completed && did_complete_at(difficulties.front())) {
item["label"] = game_config::images::victory_laurel_easy;
} else {
item["label"] = game_config::images::victory_laurel;