X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=libcurl.c;h=f71dfaafc6beef6ebd4673dca9ffbb7aa69681e1;hp=cd106e7e67ebfb60df40d0a1bb17b05d49dbf6d5;hb=4d34e0a632cbc401712f46e10bb9864438b0881f;hpb=c6d7670ed439522ba8be3959a0315cb8c4039a7f

diff --git a/libcurl.c b/libcurl.c
index cd106e7e..f71dfaaf 100644
--- a/libcurl.c
+++ b/libcurl.c
@@ -331,16 +331,16 @@ static void Curl_CheckCommandWhenDone(void)
 		if(numdownloads_fail == 0)
 		{
 			Con_DPrintf("cURL downloads occurred, executing %s\n", command_when_done);
-			Cbuf_AddText(&cmd_client, "\n");
-			Cbuf_AddText(&cmd_client, command_when_done);
-			Cbuf_AddText(&cmd_client, "\n");
+			Cbuf_AddText(cmd_local, "\n");
+			Cbuf_AddText(cmd_local, command_when_done);
+			Cbuf_AddText(cmd_local, "\n");
 		}
 		else
 		{
 			Con_DPrintf("cURL downloads FAILED, executing %s\n", command_when_error);
-			Cbuf_AddText(&cmd_client, "\n");
-			Cbuf_AddText(&cmd_client, command_when_error);
-			Cbuf_AddText(&cmd_client, "\n");
+			Cbuf_AddText(cmd_local, "\n");
+			Cbuf_AddText(cmd_local, command_when_error);
+			Cbuf_AddText(cmd_local, "\n");
 		}
 		Curl_Clear_forthismap();
 	}
@@ -1119,13 +1119,13 @@ qbool Curl_Begin_ToMemory_POST(const char *URL, const char *extraheaders, double
 
 /*
 ====================
-Curl_Run
+Curl_Frame
 
 call this regularily as this will always download as much as possible without
 blocking.
 ====================
 */
-void Curl_Run(void)
+void Curl_Frame(void)
 {
 	double maxspeed;
 	downloadinfo *di;
@@ -1268,7 +1268,7 @@ void Curl_CancelAll(void)
 ====================
 Curl_Running
 
-returns true iff there is a download running.
+returns true if there is a download running.
 ====================
 */
 qbool Curl_Running(void)
@@ -1494,7 +1494,7 @@ static void Curl_Curl_f(cmd_state_t *cmd)
 						dpsnprintf(donecommand, sizeof(donecommand), "connect %s", cls.netcon->address);
 						Curl_CommandWhenDone(donecommand);
 						noclear = true;
-						CL_Disconnect();
+						CL_Disconnect(false, NULL);
 						noclear = false;
 						Curl_CheckCommandWhenDone();
 					}
@@ -1553,7 +1553,7 @@ void Curl_Init_Commands(void)
 	Cvar_RegisterVariable (&cl_curl_useragent);
 	Cvar_RegisterVariable (&cl_curl_useragent_append);
 	Cmd_AddCommand(CF_CLIENT | CF_CLIENT_FROM_SERVER, "curl", Curl_Curl_f, "download data from an URL and add to search path");
-	//Cmd_AddCommand(&cmd_client, "curlcat", Curl_CurlCat_f, "display data from an URL (debugging command)");
+	//Cmd_AddCommand(cmd_local, "curlcat", Curl_CurlCat_f, "display data from an URL (debugging command)");
 }
 
 /*