X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Furllib.qc;h=8529ebd6dd52f38bab8fef47ecd3b6fc48b72070;hb=153e558088db2813f7f7dd5367244b5470f4d425;hp=c69d2f44aab4139b44e1da806baa8e6edbb58a7a;hpb=e95cf471e2b4a66a099aff48cad52b3b37951518;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/urllib.qc b/qcsrc/common/urllib.qc
index c69d2f44a..8529ebd6d 100644
--- a/qcsrc/common/urllib.qc
+++ b/qcsrc/common/urllib.qc
@@ -1,7 +1,21 @@
+#if defined(CSQC)
+	#include "../dpdefs/csprogsdefs.qh"
+	#include "constants.qh"
+	#include "util.qh"
+	#include "urllib.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+	#include "../dpdefs/progsdefs.qh"
+    #include "../dpdefs/dpextensions.qh"
+    #include "constants.qh"
+    #include "util.qh"
+    #include "urllib.qh"
+#endif
+
 // files
 .float url_fh;
-#define URL_FH_CURL   -1
-#define URL_FH_STDOUT -2
+const float URL_FH_CURL = -1;
+const float URL_FH_STDOUT = -2;
 
 // URLs
 .string url_url;
@@ -14,13 +28,13 @@
 .entity url_ready_pass;
 
 // for multi handles
-.float url_attempt;
-.float url_mode;
+.int url_attempt;
+.int url_mode;
 
 entity url_fromid[NUM_URL_ID];
-float autocvar__urllib_nextslot;
+int autocvar__urllib_nextslot;
 
-float url_URI_Get_Callback(float id, float status, string data)
+float url_URI_Get_Callback(int id, float status, string data)
 {
 	if(id < MIN_URL_ID)
 		return 0;
@@ -82,10 +96,10 @@ float url_URI_Get_Callback(float id, float status, string data)
 	}
 }
 
-void url_single_fopen(string url, float mode, url_ready_func rdy, entity pass)
+void url_single_fopen(string url, int mode, url_ready_func rdy, entity pass)
 {
 	entity e;
-	float i;
+	int i;
 	if(strstrofs(url, "://", 0) >= 0)
 	{
 		switch(mode)
@@ -159,7 +173,7 @@ void url_single_fopen(string url, float mode, url_ready_func rdy, entity pass)
 				url_fromid[i] = e;
 
 				// make sure this slot won't be reused quickly even on map change
-				cvar_set("_urllib_nextslot", ftos(mod(i + 1, NUM_URL_ID)));
+				cvar_set("_urllib_nextslot", ftos((i + 1) % NUM_URL_ID));
 				break;
 		}
 	}
@@ -209,7 +223,7 @@ void url_single_fopen(string url, float mode, url_ready_func rdy, entity pass)
 // close a file
 void url_fclose(entity e)
 {
-	float i;
+	int i;
 
 	if(e.url_fh == URL_FH_CURL)
 	{
@@ -262,7 +276,7 @@ void url_fclose(entity e)
 			url_fromid[i] = e;
 
 			// make sure this slot won't be reused quickly even on map change
-			cvar_set("_urllib_nextslot", ftos(mod(i + 1, NUM_URL_ID)));
+			cvar_set("_urllib_nextslot", ftos((i + 1) % NUM_URL_ID));
 		}
 		else
 		{
@@ -363,7 +377,7 @@ void url_multi_ready(entity fh, entity me, float status)
 	}
 	me.url_ready(fh, me.url_ready_pass, status);
 }
-void url_multi_fopen(string url, float mode, url_ready_func rdy, entity pass)
+void url_multi_fopen(string url, int mode, url_ready_func rdy, entity pass)
 {
 	float n;
 	n = tokenize_console(url);