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

Removed a bunch of things deprecated at level 3

Browse source 
* [combo] in [modification]s
* Support for legacy DescriptionWML in the MP Faction Select dialog
This commit is contained in:
Charles Dang 2018-05-15 11:53:24 +11:00
parent 021339bcc5
commit a766d2d93a
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game_initialization/create_engine.cpp
View file

@ -425,10 +425,6 @@ std::string create_engine::select_campaign_difficulty(int set_value)
difficulties.push_back(d["define"]);
}
if(difficulties.empty()) {
difficulties = utils::split(current_level().data()["difficulties"]);
}
// No difficulties found. Exit
if(difficulties.empty()) {
return "";

6
src/gui/dialogs/multiplayer/mp_options_helper.cpp
View file

@ -252,11 +252,7 @@ void mp_options_helper::display_custom_options(const std::string& type, int node
} else if(opt.key == "spacer") {
option_node.add_child("options_spacer_node", empty_map);
} else if(opt.key == "choice" || opt.key == "combo") {
if(opt.key == "combo") {
deprecated_message("combo", DEP_LEVEL::FOR_REMOVAL, {1, 15, 0}, "Use [choice] instead.");
}
} else if(opt.key == "choice") {
if(!option_cfg.has_child("item")) {
continue;
}