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

Handle replace= lines properly in the launcher

Browse Source
This commit is contained in:
AnyOldName3 2024-02-27 01:39:49 +00:00
parent 626f438dcc
commit 90966ecc47
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
components/config/gamesettings.cpp
View File

@ -98,8 +98,32 @@ bool Config::GameSettings::readUserFile(QTextStream& stream, bool ignoreContent)
bool Config::GameSettings::readFile(QTextStream& stream, QMultiMap<QString, QString>& settings, bool ignoreContent) bool Config::GameSettings::readFile(QTextStream& stream, QMultiMap<QString, QString>& settings, bool ignoreContent)
{ {
QMultiMap<QString, QString> cache; QMultiMap<QString, QString> cache;
QRegularExpression replaceRe("^\\s*replace\\s*=\\s*(.+)$");
QRegularExpression keyRe("^([^=]+)\\s*=\\s*(.+)$"); QRegularExpression keyRe("^([^=]+)\\s*=\\s*(.+)$");
auto initialPos = stream.pos();
while (!stream.atEnd())
{
QString line = stream.readLine();
if (line.isEmpty() || line.startsWith("#"))
continue;
QRegularExpressionMatch match = keyRe.match(line);
if (match.hasMatch())
{
QString key = match.captured(1).trimmed();
// Replace composing entries with a replace= line
if (key == QLatin1String("data") || key == QLatin1String("fallback-archive")
|| key == QLatin1String("content") || key == QLatin1String("groundcover")
|| key == QLatin1String("script-blacklist"))
settings.remove(key);
}
}
stream.seek(initialPos);
while (!stream.atEnd()) while (!stream.atEnd())
{ {
QString line = stream.readLine(); QString line = stream.readLine();