aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/MojangDownloadInfo.h
diff options
context:
space:
mode:
Diffstat (limited to 'launcher/minecraft/MojangDownloadInfo.h')
-rw-r--r--launcher/minecraft/MojangDownloadInfo.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/launcher/minecraft/MojangDownloadInfo.h b/launcher/minecraft/MojangDownloadInfo.h
index b98a0168..855dbe00 100644
--- a/launcher/minecraft/MojangDownloadInfo.h
+++ b/launcher/minecraft/MojangDownloadInfo.h
@@ -19,8 +19,8 @@ struct MojangDownloadInfo {
};
struct MojangLibraryDownloadInfo {
- MojangLibraryDownloadInfo(MojangDownloadInfo::Ptr artifact) : artifact(artifact){};
- MojangLibraryDownloadInfo(){};
+ MojangLibraryDownloadInfo(MojangDownloadInfo::Ptr artifact_) : artifact(artifact_) {}
+ MojangLibraryDownloadInfo() {}
// types
typedef std::shared_ptr<MojangLibraryDownloadInfo> Ptr;
@@ -47,18 +47,18 @@ struct MojangAssetIndexInfo : public MojangDownloadInfo {
// methods
MojangAssetIndexInfo() {}
- MojangAssetIndexInfo(QString id)
+ MojangAssetIndexInfo(QString id_)
{
- this->id = id;
+ this->id = id_;
// HACK: ignore assets from other version files than Minecraft
// workaround for stupid assets issue caused by amazon:
// https://www.theregister.co.uk/2017/02/28/aws_is_awol_as_s3_goes_haywire/
- if (id == "legacy") {
+ if (id_ == "legacy") {
url = "https://piston-meta.mojang.com/mc/assets/legacy/c0fd82e8ce9fbc93119e40d96d5a4e62cfa3f729/legacy.json";
}
// HACK
else {
- url = "https://s3.amazonaws.com/Minecraft.Download/indexes/" + id + ".json";
+ url = "https://s3.amazonaws.com/Minecraft.Download/indexes/" + id_ + ".json";
}
known = false;
}