mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-13 07:06:43 +00:00
Code Issues Releases Wiki Activity

Merge branch 'even-fixier-config' into 'master'

Browse source 
Merge all composing variables, not just those in destination already

See merge request OpenMW/openmw!383
This commit is contained in:
AnyOldName3 2020-10-28 02:02:18 +00:00
commit fb53b397ff
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
components/files/configurationmanager.cpp
View file

@ -87,7 +87,7 @@ boost::program_options::variables_map ConfigurationManager::separateComposingVar
boost::program_options::variables_map composingVariables; boost::program_options::variables_map composingVariables;
for (auto itr = variables.begin(); itr != variables.end();) for (auto itr = variables.begin(); itr != variables.end();)
{ {
if (description.find((*itr).first, false).semantic()->is_composing()) if (description.find(itr->first, false).semantic()->is_composing())
{ {
composingVariables.emplace(*itr); composingVariables.emplace(*itr);
itr = variables.erase(itr); itr = variables.erase(itr);
@ -100,14 +100,23 @@ boost::program_options::variables_map ConfigurationManager::separateComposingVar
void ConfigurationManager::mergeComposingVariables(boost::program_options::variables_map & first, boost::program_options::variables_map & second, boost::program_options::options_description& description) void ConfigurationManager::mergeComposingVariables(boost::program_options::variables_map & first, boost::program_options::variables_map & second, boost::program_options::options_description& description)
{ {
for (auto& [name, variableValue] : first) for (const auto& option : description.options())
{ {
if (description.find(name, false).semantic()->is_composing()) if (option->semantic()->is_composing())
{ {
std::string name = option->canonical_display_name();
auto firstPosition = first.find(name);
if (firstPosition == first.end())
{
first.emplace(name, second[name]);
continue;
}
if (second[name].defaulted() || second[name].empty()) if (second[name].defaulted() || second[name].empty())
continue; continue;
boost::any& firstValue = variableValue.value(); boost::any& firstValue = firstPosition->second.value();
const boost::any& secondValue = second[name].value(); const boost::any& secondValue = second[name].value();
if (firstValue.type() == typeid(Files::EscapePathContainer)) if (firstValue.type() == typeid(Files::EscapePathContainer))