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

Default addon version and ID to an empty string rather than N/A.

Browse source
This commit is contained in:
pentarctagon 2020-06-18 12:17:41 -05:00
parent 07c68e3dfc
commit 0090e5f9b2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/game_initialization/mp_game_utils.cpp
View file

@ -80,8 +80,8 @@ config initial_level_config(saved_game& state)
config level = state.to_config();
add_multiplayer_classification(level.child_or_add("multiplayer"), state);
level.child("multiplayer")["mp_scenario_addon_id"] = level.child("scenario")["addon_id"].str("N/A");
level.child("multiplayer")["mp_scenario_addon_version"] = state.to_config().child("scenario")["addon_version"].str("N/A");
level.child("multiplayer")["mp_scenario_addon_id"] = level.child("scenario")["addon_id"].str();
level.child("multiplayer")["mp_scenario_addon_version"] = state.to_config().child("scenario")["addon_version"].str();
// [multiplayer] mp_era= should be persistent over saves.
std::string era = params.mp_era;
@ -111,8 +111,8 @@ config initial_level_config(saved_game& state)
} else {
level.add_child("era", era_cfg);
level.child("multiplayer")["mp_era_addon_id"] = era_cfg["addon_id"].str("N/A");
level.child("multiplayer")["mp_era_addon_version"] = era_cfg["addon_version"].str("N/A");
level.child("multiplayer")["mp_era_addon_id"] = era_cfg["addon_id"].str();
level.child("multiplayer")["mp_era_addon_version"] = era_cfg["addon_version"].str();
// Initialize the list of sides available for the current era.
// We also need this so not to get a segfault in mp_staging for ai configuration.
@ -127,8 +127,8 @@ config initial_level_config(saved_game& state)
for(unsigned i = 0; i < mods.size(); ++i) {
if(const config& mod_cfg = game_config.find_child("modification", "id", mods[i])) {
mod_versions.push_back(mod_cfg["addon_version"].str("N/A"));
mod_addon_ids.push_back(mod_cfg["addon_id"].str("N/A"));
mod_versions.push_back(mod_cfg["addon_version"].str());
mod_addon_ids.push_back(mod_cfg["addon_id"].str());
level.add_child("modification", mod_cfg);
}
}