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

MP Create: Minor cleanup

Browse source
This commit is contained in:
Celtic Minstrel 2016-08-19 20:07:45 -04:00
parent ba8c3b97b7
commit 178ef3118a
2 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -709,8 +709,8 @@ void tmp_create_game::post_show(twindow& window)
config options;
for(const auto& mod_pair : visible_options_) {
config& mod = options.add_child(mod_pair.first[0]);
mod["id"] = mod_pair.first[1];
config& mod = options.add_child(mod_pair.first.level_type);
mod["id"] = mod_pair.first.id;
for(const auto& pair : mod_pair.second) {
//TODO: change this to some key=value format as soon as we drop the old mp configure screen.
mod.add_child("option", config_of("id", pair.first)("value", pair.second()));

30
src/gui/dialogs/multiplayer/mp_create_game.hpp
View file

@ -48,7 +48,16 @@ private:
const config& cfg_;
std::map<std::array<std::string, 2>, std::map<std::string, std::function<config::attribute_value(void)>>> visible_options_;
struct option_source {
std::string level_type;
std::string id;
friend bool operator<(const option_source& a, const option_source& b) {
return a.level_type < b.level_type && a.id < b.id;
}
};
using option_getter = std::function<config::attribute_value()>;
using option_map = std::map<std::string, option_getter>;
std::map<option_source, option_map> visible_options_;
ng::create_engine& create_engine_;
std::unique_ptr<ng::configure_engine> config_engine_;
@ -68,9 +77,24 @@ private:
* manually controlled as well so add the pointers here as well.
*/
tfield_bool* use_map_settings_, *fog_, *shroud_, *start_time_, *time_limit_, *shuffle_sides_, *observers_, *registered_users_, *strict_sync_;
tfield_bool* use_map_settings_;
tfield_bool* fog_;
tfield_bool* shroud_;
tfield_bool* start_time_;
tfield_bool* time_limit_;
tfield_bool* shuffle_sides_;
tfield_bool* observers_;
tfield_bool* registered_users_;
tfield_bool* strict_sync_;
tfield_integer* turns_, *gold_, *support_, *experience_, *init_turn_limit, *turn_bonus_, *reservior_, *action_bonus_;
tfield_integer* turns_;
tfield_integer* gold_;
tfield_integer* support_;
tfield_integer* experience_;
tfield_integer* init_turn_limit;
tfield_integer* turn_bonus_;
tfield_integer* reservior_;
tfield_integer* action_bonus_;
template<typename widget>
void on_filter_change(twindow& window, const std::string& id);