X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Furllib.qc;h=c69d2f44aab4139b44e1da806baa8e6edbb58a7a;hb=1d1feb3163448355ace019ab1c278e47ab2ea77f;hp=1bc06502734f66719fd81fabb14b17bb7bd14b3e;hpb=d51982782510331bbe81069d3a9f3049a2bbf268;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/urllib.qc b/qcsrc/common/urllib.qc index 1bc065027..c69d2f44a 100644 --- a/qcsrc/common/urllib.qc +++ b/qcsrc/common/urllib.qc @@ -13,6 +13,10 @@ .url_ready_func url_ready; .entity url_ready_pass; +// for multi handles +.float url_attempt; +.float url_mode; + entity url_fromid[NUM_URL_ID]; float autocvar__urllib_nextslot; @@ -29,7 +33,7 @@ float url_URI_Get_Callback(float id, float status, string data) return 0; if(e.url_rbuf >= 0 || e.url_wbuf >= 0) { - print(sprintf("WARNING: handle %d (%s) has already received data?!?\n", id + NUM_URL_ID, e.url_url)); + printf("WARNING: handle %d (%s) has already received data?!?\n", id + NUM_URL_ID, e.url_url); return 0; } @@ -345,16 +349,16 @@ void url_multi_ready(entity fh, entity me, float status) remove(me); return; } - me.cnt += 1; + me.url_attempt += 1; n = tokenize_console(me.url_url); - if(n <= me.cnt) + if(n <= me.url_attempt) { me.url_ready(fh, me.url_ready_pass, status); strunzone(me.url_url); remove(me); return; } - url_single_fopen(argv(me.cnt), me.lip, url_multi_ready, me); + url_single_fopen(argv(me.url_attempt), me.url_mode, url_multi_ready, me); return; } me.url_ready(fh, me.url_ready_pass, status); @@ -374,8 +378,8 @@ void url_multi_fopen(string url, float mode, url_ready_func rdy, entity pass) me = spawn(); me.classname = "url_multi"; me.url_url = strzone(url); - me.cnt = 0; - me.lip = mode; + me.url_attempt = 0; + me.url_mode = mode; me.url_ready = rdy; me.url_ready_pass = pass; url_single_fopen(argv(0), mode, url_multi_ready, me);