make urllib actually work

diff --git a/qcsrc/common/urllib.qc b/qcsrc/common/urllib.qc
index 7898e9206f102e1c8d421c7cd6800fe13a162b21..7a5f333478211354d14f7bef49bcccfb33ead585 100644 (file)
--- a/qcsrc/common/urllib.qc
+++ b/qcsrc/common/urllib.qc
@@ -11,8 +11,6 @@
 .url_ready_func url_ready;
 .entity url_ready_pass;
 
-#define MIN_URL_ID 128
-#define NUM_URL_ID 64
 entity url_fromid[NUM_URL_ID];
 float autocvar__urllib_nextslot;
 

diff --git a/qcsrc/common/urllib.qh b/qcsrc/common/urllib.qh
index 603aae90d44b9f30d8e29313131b12624a89c018..a7735ed4f3f9ee1b05d279366125e7dfe0dd4a05 100644 (file)
--- a/qcsrc/common/urllib.qh
+++ b/qcsrc/common/urllib.qh
@@ -12,3 +12,5 @@ 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

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 9b0324755a41669bc1b6d0a750a306d45d481bba..09e2dfb05d4b60e64154b00498cc919b3369fc50 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -2045,7 +2045,11 @@ void URI_Get_Callback(float id, float status, string data)
     dprint(data);
     dprint("\nEnd of data.\n");
 
-    if (id == URI_GET_DISCARD)
+    if(url_URI_Get_Callback(id, status, data))
+    {
+        // handled
+    }
+    else if (id == URI_GET_DISCARD)
     {
         // discard
     }