mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 09:32:45 +00:00
Code Issues Projects Releases Wiki Activity

Resync composing and path openmw.cfg settings with options.cpp

Browse Source
This commit is contained in:
AnyOldName3 2024-02-28 23:49:55 +00:00
parent d111b4bbd9
commit 9e1334cc09
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
components/config/gamesettings.cpp
View File

@ -108,9 +108,10 @@ bool Config::GameSettings::readFile(QTextStream& stream, QMultiMap<QString, QStr
{ {
QString key = match.captured(1).trimmed(); QString key = match.captured(1).trimmed();
// Replace composing entries with a replace= line // Replace composing entries with a replace= line
if (key == QLatin1String("data") || key == QLatin1String("fallback-archive") if (key == QLatin1String("config") || key == QLatin1String("replace") || key == QLatin1String("data")
|| key == QLatin1String("content") || key == QLatin1String("groundcover") || key == QLatin1String("fallback-archive") || key == QLatin1String("content")
|| key == QLatin1String("script-blacklist")) || key == QLatin1String("groundcover") || key == QLatin1String("script-blacklist")
|| key == QLatin1String("fallback"))
settings.remove(key); settings.remove(key);
} }
} }
@ -131,12 +132,14 @@ bool Config::GameSettings::readFile(QTextStream& stream, QMultiMap<QString, QStr
QString value = match.captured(2).trimmed(); QString value = match.captured(2).trimmed();
// Don't remove composing entries // Don't remove composing entries
if (key != QLatin1String("data") && key != QLatin1String("fallback-archive") if (key != QLatin1String("config") && key != QLatin1String("replace") && key != QLatin1String("data")
&& key != QLatin1String("content") && key != QLatin1String("groundcover") && key != QLatin1String("fallback-archive") && key != QLatin1String("content")
&& key != QLatin1String("script-blacklist")) && key != QLatin1String("groundcover") && key != QLatin1String("script-blacklist")
&& key != QLatin1String("fallback"))
settings.remove(key); settings.remove(key);
if (key == QLatin1String("data") || key == QLatin1String("data-local") || key == QLatin1String("resources") if (key == QLatin1String("config") || key == QLatin1String("user-data") || key == QLatin1String("resources")
|| key == QLatin1String("data") || key == QLatin1String("data-local")
|| key == QLatin1String("load-savegame")) || key == QLatin1String("load-savegame"))
{ {
// Path line (e.g. 'data=...'), so needs processing to deal with ampersands and quotes // Path line (e.g. 'data=...'), so needs processing to deal with ampersands and quotes
@ -204,8 +207,9 @@ bool Config::GameSettings::writeFile(QTextStream& stream)
// Boost-like quoting rules but internally stores as a std::filesystem::path. // Boost-like quoting rules but internally stores as a std::filesystem::path.
// Caution: This is intentional behaviour to duplicate how Boost and what we replaced it with worked, and we // Caution: This is intentional behaviour to duplicate how Boost and what we replaced it with worked, and we
// rely on that. // rely on that.
if (i.key() == QLatin1String("data") || i.key() == QLatin1String("data-local") if (i.key() == QLatin1String("config") || i.key() == QLatin1String("user-data")
|| i.key() == QLatin1String("resources") || i.key() == QLatin1String("load-savegame")) || i.key() == QLatin1String("resources") || i.key() == QLatin1String("data")
|| i.key() == QLatin1String("data-local") || i.key() == QLatin1String("load-savegame"))
{ {
stream << i.key() << "="; stream << i.key() << "=";
@ -428,8 +432,9 @@ bool Config::GameSettings::writeFileWithComments(QFile& file)
// Boost-like quoting rules but internally stores as a std::filesystem::path. // Boost-like quoting rules but internally stores as a std::filesystem::path.
// Caution: This is intentional behaviour to duplicate how Boost and what we replaced it with worked, and we // Caution: This is intentional behaviour to duplicate how Boost and what we replaced it with worked, and we
// rely on that. // rely on that.
if (it.key() == QLatin1String("data") || it.key() == QLatin1String("data-local") if (it.key() == QLatin1String("config") || it.key() == QLatin1String("user-data")
|| it.key() == QLatin1String("resources") || it.key() == QLatin1String("load-savegame")) || it.key() == QLatin1String("resources") || it.key() == QLatin1String("data")
|| it.key() == QLatin1String("data-local") || it.key() == QLatin1String("load-savegame"))
{ {
settingLine = it.key() + "="; settingLine = it.key() + "=";