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

MP/Create Game: don't hardcode random faction mode options

Browse source 
This still means we need to make sure the options are in the same order as in the enum,
but that was also the case in the old code.
This commit is contained in:
Charles Dang 2022-05-28 17:09:26 -04:00
parent 3264bf4200
commit da4a201101
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
data/gui/window/mp_create_game.cfg
View file

@ -171,6 +171,23 @@
[menu_button]
id = "random_faction_mode"
definition = "default"
# Note: ensure these are in the same order as the random_faction_mode enum
[option]
label = _ "Independent"
tooltip = _ "Independent: Random factions assigned independently"
[/option]
[option]
label = _ "No Mirror"
tooltip = _ "No Mirror: No two players will get the same faction"
[/option]
[option]
label = _ "No Ally Mirror"
tooltip = _ "No Ally Mirror: No two allied players will get the same faction"
[/option]
[/menu_button]
[/column]

15
src/gui/dialogs/multiplayer/mp_create_game.cpp
View file

@ -253,23 +253,10 @@ void mp_create_game::pre_show(window& win)
//
// Set up random faction mode menu_button
//
static const random_faction_mode::sized_array<t_string> names {_("Independent"), _("No Mirror"), _("No Ally Mirror")};
static const random_faction_mode::sized_array<t_string> tooltips {
_("Independent: Random factions assigned independently"),
_("No Mirror: No two players will get the same faction"),
_("No Ally Mirror: No two allied players will get the same faction")
};
std::vector<config> rfm_options;
for(std::size_t i = 0; i < random_faction_mode::size(); i++) {
rfm_options.emplace_back("label", names[i]);
rfm_options[i]["tooltip"] = tooltips[i];
};
const int initial_index = static_cast<int>(random_faction_mode::get_enum(prefs::random_faction_mode()).value_or(random_faction_mode::type::independent));
menu_button& rfm_menu_button = find_widget<menu_button>(&win, "random_faction_mode", false);
rfm_menu_button.set_values(rfm_options, initial_index);
rfm_menu_button.set_selected(initial_index);
connect_signal_notify_modified(rfm_menu_button,
std::bind(&mp_create_game::on_random_faction_mode_select, this));