aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/MojangDownloadInfo.h
diff options
context:
space:
mode:
authorTheKodeToad <TheKodeToad@proton.me>2023-08-13 13:10:58 +0100
committerGitHub <noreply@github.com>2023-08-13 13:10:58 +0100
commita44cb6430eac81e6e89283c50b57142ca7f05747 (patch)
treef51678d129432b0a68d22de0178ccb8fd4f9a927 /launcher/minecraft/MojangDownloadInfo.h
parent44153a28e369943ea16545146fec81f7a62e44dd (diff)
parent35358f8180468af1572c35425b1f60c899d6b07d (diff)
downloadPrismLauncher-a44cb6430eac81e6e89283c50b57142ca7f05747.tar.gz
PrismLauncher-a44cb6430eac81e6e89283c50b57142ca7f05747.tar.bz2
PrismLauncher-a44cb6430eac81e6e89283c50b57142ca7f05747.zip
Merge pull request #1107 from Ryex/chore/add-compiler-warnings
Introduce more strict compiler warnings and fix them
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 13e27e15..6831d8d8 100644
--- a/launcher/minecraft/MojangDownloadInfo.h
+++ b/launcher/minecraft/MojangDownloadInfo.h
@@ -23,8 +23,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;
@@ -57,20 +57,20 @@ struct MojangAssetIndexInfo : public MojangDownloadInfo
{
}
- 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;
}