X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=libcurl.c;h=843fb74a686b200fa748358427c6bed6982c0a5f;hb=7775d7f413d36055857539ba8e1862f8ea942d82;hp=3ee6111b3623ca8b0619c2c0699eaa1485ba9a41;hpb=f2adba1fd170cc24a7b98e756d8d9f11da0e3d62;p=xonotic%2Fdarkplaces.git

diff --git a/libcurl.c b/libcurl.c
index 3ee6111b..843fb74a 100644
--- a/libcurl.c
+++ b/libcurl.c
@@ -6,7 +6,7 @@ static cvar_t cl_curl_maxdownloads = {CVAR_SAVE, "cl_curl_maxdownloads","1", "ma
 static cvar_t cl_curl_maxspeed = {CVAR_SAVE, "cl_curl_maxspeed","100", "maximum download speed (KiB/s)"};
 static cvar_t sv_curl_defaulturl = {CVAR_SAVE, "sv_curl_defaulturl","", "default autodownload source URL"};
 static cvar_t sv_curl_serverpackages = {CVAR_SAVE, "sv_curl_serverpackages","", "list of required files for the clients, separated by spaces"};
-static cvar_t cl_curl_enabled = {CVAR_SAVE, "cl_curl_enabled","0", "whether client's download support is enabled"};
+static cvar_t cl_curl_enabled = {CVAR_SAVE, "cl_curl_enabled","1", "whether client's download support is enabled"};
 
 /*
 =================================================================
@@ -281,7 +281,7 @@ static void Curl_CheckCommandWhenDone()
 		return;
 	if(numdownloads_added && (numdownloads_success == numdownloads_added) && *command_when_done)
 	{
-		Con_DPrintf("Map downloads occurred, executing %s\n", command_when_done);
+		Con_DPrintf("cURL downloads occurred, executing %s\n", command_when_done);
 		Cbuf_AddText("\n");
 		Cbuf_AddText(command_when_done);
 		Cbuf_AddText("\n");
@@ -289,7 +289,7 @@ static void Curl_CheckCommandWhenDone()
 	}
 	else if(numdownloads_added && numdownloads_fail && *command_when_error)
 	{
-		Con_DPrintf("Map downloads FAILED, executing %s\n", command_when_error);
+		Con_DPrintf("cURL downloads FAILED, executing %s\n", command_when_error);
 		Cbuf_AddText("\n");
 		Cbuf_AddText(command_when_error);
 		Cbuf_AddText("\n");
@@ -311,12 +311,16 @@ static qboolean CURL_OpenLibrary (void)
 #if defined(WIN64)
 		"libcurl64.dll",
 #elif defined(WIN32)
+		"libcurl-4.dll",
 		"libcurl-3.dll",
 #elif defined(MACOSX)
+		"libcurl.4.dylib", // Mac OS X Notyetreleased
 		"libcurl.3.dylib", // Mac OS X Tiger
 		"libcurl.2.dylib", // Mac OS X Panther
 #else
+		"libcurl.so.4",
 		"libcurl.so.3",
+		"libcurl.so", // FreeBSD
 #endif
 		NULL
 	};
@@ -1272,7 +1276,7 @@ void Curl_ClearRequirements()
 	}
 	p = sv_curl_serverpackages.string;
 	Con_DPrintf("Require all of: %s\n", p);
-	while(COM_ParseTokenConsole(&p))
+	while(COM_ParseToken_Simple(&p, false, false))
 	{
 		Con_DPrintf("Require: %s\n", com_token);
 		Curl_RequireFile(com_token);