#elif defined(WIN32)
"libcurl-3.dll",
#elif defined(MACOSX)
- "libcurl.3.dylib",
+ "libcurl.3.dylib", // Mac OS X Tiger
+ "libcurl.2.dylib", // Mac OS X Panther
#else
"libcurl.so.3",
#endif
{
ok = FS_AddPack(di->filename, NULL, true);
if(ok && di->forthismap)
+ {
Mod_Reload();
+ R_Modules_NewMap();
+ }
}
if(!ok && di->forthismap)
Con_DPrintf("(pak was already loaded)\n");
else
if(forthismap)
+ {
Mod_Reload();
+ R_Modules_NewMap();
+ }
return;
}
else
// for each requirement, find the pack name
char sendbuffer[4096] = "";
requirement *req;
-
- strlcat(sendbuffer, "curl --clear_autodownload\n", sizeof(sendbuffer));
+ qboolean foundone = false;
for(req = requirements; req; req = req->next)
{
if(packurl && *packurl && strcmp(packurl, "-"))
{
+ if(!foundone)
+ strlcat(sendbuffer, "curl --clear_autodownload\n", sizeof(sendbuffer));
+
strlcat(sendbuffer, "curl --pak --forthismap --as ", sizeof(sendbuffer));
strlcat(sendbuffer, thispack, sizeof(sendbuffer));
strlcat(sendbuffer, " --for ", sizeof(sendbuffer));
strlcat(sendbuffer, packurl, sizeof(sendbuffer));
strlcat(sendbuffer, thispack, sizeof(sendbuffer));
strlcat(sendbuffer, "\n", sizeof(sendbuffer));
+
+ foundone = true;
}
}
- strlcat(sendbuffer, "curl --finish_autodownload\n", sizeof(sendbuffer));
+ if(foundone)
+ strlcat(sendbuffer, "curl --finish_autodownload\n", sizeof(sendbuffer));
if(strlen(sendbuffer) + 1 < sizeof(sendbuffer))
Host_ClientCommands("%s", sendbuffer);