aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform
diff options
context:
space:
mode:
authorJamie Mansfield <jmansfield@cadixdev.org>2022-05-05 20:58:12 +0100
committerJamie Mansfield <jmansfield@cadixdev.org>2022-05-21 15:20:38 +0100
commitb84d52be3d1109efc2c9e35304831314050bd398 (patch)
treeed249a2935f591e08efa2ff0e8a2ad538d44ffba /launcher/modplatform
parent305973c0e7c07693a8b08d1908e64fc4986e13e0 (diff)
downloadPrismLauncher-b84d52be3d1109efc2c9e35304831314050bd398.tar.gz
PrismLauncher-b84d52be3d1109efc2c9e35304831314050bd398.tar.bz2
PrismLauncher-b84d52be3d1109efc2c9e35304831314050bd398.zip
ATLauncher: Display warnings when selecting optional mods
Diffstat (limited to 'launcher/modplatform')
-rw-r--r--launcher/modplatform/atlauncher/ATLPackManifest.cpp6
-rw-r--r--launcher/modplatform/atlauncher/ATLPackManifest.h2
2 files changed, 8 insertions, 0 deletions
diff --git a/launcher/modplatform/atlauncher/ATLPackManifest.cpp b/launcher/modplatform/atlauncher/ATLPackManifest.cpp
index 259c170c..d01ec32c 100644
--- a/launcher/modplatform/atlauncher/ATLPackManifest.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackManifest.cpp
@@ -198,6 +198,7 @@ static void loadVersionMod(ATLauncher::VersionMod & p, QJsonObject & obj) {
}
}
p.colour = Json::ensureString(obj, QString("colour"), "");
+ p.warning = Json::ensureString(obj, QString("warning"), "");
p.client = Json::ensureBoolean(obj, QString("client"), false);
@@ -264,6 +265,11 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
v.colours[key] = Json::requireString(colourObj.value(key), "colour");
}
+ auto warningsObj = Json::ensureObject(obj, "warnings");
+ for (const auto &key : warningsObj.keys()) {
+ v.warnings[key] = Json::requireString(warningsObj.value(key), "warning");
+ }
+
auto messages = Json::ensureObject(obj, "messages");
loadVersionMessages(v.messages, messages);
}
diff --git a/launcher/modplatform/atlauncher/ATLPackManifest.h b/launcher/modplatform/atlauncher/ATLPackManifest.h
index 931a11dc..23e162e3 100644
--- a/launcher/modplatform/atlauncher/ATLPackManifest.h
+++ b/launcher/modplatform/atlauncher/ATLPackManifest.h
@@ -130,6 +130,7 @@ struct VersionMod
QString group;
QVector<QString> depends;
QString colour;
+ QString warning;
bool client;
@@ -163,6 +164,7 @@ struct PackVersion
VersionConfigs configs;
QMap<QString, QString> colours;
+ QMap<QString, QString> warnings;
VersionMessages messages;
};