fix YUV tables

[xonotic/darkplaces.git] / libcurl.c

diff --git a/libcurl.c b/libcurl.c
index 28b18f5f94417d2636e90aade839e0030f92de2a..4eac714a69a677d293a470b24a7ba8549a752cfb 100644 (file)
--- a/libcurl.c
+++ b/libcurl.c
@@ -441,6 +441,7 @@ CURL_DOWNLOAD_FAILED or CURL_DOWNLOAD_ABORTED) and in the second case the error
 code from libcurl, or 0, if another error has occurred.
 ====================
 */
+static qboolean Curl_Begin(const char *URL, const char *name, qboolean ispak, qboolean forthismap, unsigned char *buf, size_t bufsize, curl_callback_t callback, void *cbdata);
 static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error)
 {
        qboolean ok = false;
@@ -491,7 +492,25 @@ static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error
                FS_Close(di->stream);
 
        if(ok && di->ispak)
+       {
                ok = FS_AddPack(di->filename, NULL, true);
+               if(!ok)
+               {
+                       // pack loading failed?
+                       // this is critical
+                       // better clear the file again...
+                       di->stream = FS_OpenRealFile(di->filename, "wb", false);
+                       FS_Close(di->stream);
+
+                       if(di->startpos && !di->callback)
+                       {
+                               // this was a resume?
+                               // then try to redownload it without reporting the error
+                               Curl_Begin(di->url, di->filename, di->ispak, di->forthismap, NULL, 0, NULL, NULL);
+                               di->forthismap = false; // don't count the error
+                       }
+               }
+       }
 
        if(di->prev)
                di->prev->next = di->next;
@@ -748,7 +767,7 @@ static qboolean Curl_Begin(const char *URL, const char *name, qboolean ispak, qb
                                }
                                else
                                {
-                                       qfile_t *f = FS_OpenVirtualFile(fn, false);
+                                       qfile_t *f = FS_OpenRealFile(fn, "rb", false);
                                        if(f)
                                        {
                                                char buf[4] = {0};
@@ -791,7 +810,7 @@ static qboolean Curl_Begin(const char *URL, const char *name, qboolean ispak, qb
                di->startpos = 0;
                di->curle = NULL;
                di->started = false;
-               di->ispak = ispak;
+               di->ispak = (ispak && !buf);
                di->bytes_received = 0;
                di->next = downloads;
                di->prev = NULL;