From c0b807699e40c1a9d2ace3c2d641d94d633fb230 Mon Sep 17 00:00:00 2001 From: beaglejoe Date: Wed, 17 Feb 2016 18:46:19 +0000 Subject: [PATCH] Fix for auto-downloading --- packaging/windows/speed-dreams-base.nsi | 6 +++--- packaging/windows/speed-dreams.nsh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/windows/speed-dreams-base.nsi b/packaging/windows/speed-dreams-base.nsi index 9542af635..e74aedf59 100644 --- a/packaging/windows/speed-dreams-base.nsi +++ b/packaging/windows/speed-dreams-base.nsi @@ -230,7 +230,7 @@ Section /o "HQ cars and tracks (1)" SEC03 StrCpy $1 "speed-dreams-${HQCARSTRACKS_SETUP_KEY}-${GAME_LONG_VERSION}-win32-setup.exe" StrCpy $2 "HQ cars and tracks (1)" - !insertmacro DownloadPackageIfNeededAndThenInstall $1 $2 340 + !insertmacro DownloadPackageIfNeededAndThenInstall $1 $2 380 SectionEnd @@ -238,7 +238,7 @@ Section /o "HQ cars and tracks (2)" SEC04 StrCpy $1 "speed-dreams-${MOREHQCARSTRACKS_SETUP_KEY}-${GAME_LONG_VERSION}-win32-setup.exe" StrCpy $2 "HQ cars and tracks (2)" - !insertmacro DownloadPackageIfNeededAndThenInstall $1 $2 275 + !insertmacro DownloadPackageIfNeededAndThenInstall $1 $2 430 SectionEnd @@ -246,7 +246,7 @@ Section /o "WIP cars and tracks" SEC05 StrCpy $1 "speed-dreams-${WIPCARSTRACKS_SETUP_KEY}-${GAME_LONG_VERSION}-win32-setup.exe" StrCpy $2 "WIP cars and tracks" - !insertmacro DownloadPackageIfNeededAndThenInstall $1 $2 150 + !insertmacro DownloadPackageIfNeededAndThenInstall $1 $2 250 SectionEnd diff --git a/packaging/windows/speed-dreams.nsh b/packaging/windows/speed-dreams.nsh index 0faf7974c..33a9acc21 100644 --- a/packaging/windows/speed-dreams.nsh +++ b/packaging/windows/speed-dreams.nsh @@ -276,9 +276,9 @@ Function DownloadFromSFNet StrCpy $R3 "success" ; R3 : Status DetailPrint "1) Downloading default mirror URL (auto-selected by SF.net) ..." - NSISdl::download "$R1" "$R2.html" + inetc::get "$R1" "$R2.html" /end Pop $R0 - ${If} $R0 != "success" + ${If} $R0 != "OK" ${If} $R0 == "cancel" StrCpy $R3 "Mirror selection page download was cancelled" @@ -304,9 +304,9 @@ Function DownloadFromSFNet ${Else} DetailPrint "2) Downloading file from $R4 ..." - NSISdl::download "$R4" "$R2" + inetc::get "$R4" "$R2" /end Pop $R0 - ${If} $R0 != "success" + ${If} $R0 != "OK" ${If} $R0 == "cancel" StrCpy $R3 "File download was cancelled"