Merge branch 'master' into terencehill/clear_button

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / urllib.qh

diff --git a/qcsrc/common/urllib.qh b/qcsrc/common/urllib.qh
index a7735ed4f3f9ee1b05d279366125e7dfe0dd4a05..8a871c6b3fdebbfefc9945aca37c2c8dccdd7ab3 100644 (file)
--- a/qcsrc/common/urllib.qh
+++ b/qcsrc/common/urllib.qh
@@ -5,12 +5,14 @@ float URL_READY_CANREAD  =  2;
 // errors: -1, or negative HTTP status code
 typedef void(entity handle, entity pass, float status) url_ready_func;
 
-void url_fopen(string url, float mode, url_ready_func rdy, entity pass);
-void url_fclose(entity e, url_ready_func rdy, entity pass);
+void url_single_fopen(string url, float mode, url_ready_func rdy, entity pass);
+void url_fclose(entity e);
 string url_fgets(entity e);
 void url_fputs(entity e, string s);
 
 // returns true if handled
 float url_URI_Get_Callback(float id, float status, string data);
-#define MIN_URL_ID 128
-#define NUM_URL_ID 64
+#define MIN_URL_ID URI_GET_URLLIB
+#define NUM_URL_ID (URI_GET_URLLIB_END - URI_GET_URLLIB + 1)
+
+void url_multi_fopen(string url, float mode, url_ready_func rdy, entity pass);