kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/next' into release_v1.3

Browse Source
This commit is contained in:
drian
2021-02-10 21:00:09 +01:00
parent bc6941d30c cb51e9f422
commit b615fe449e
58 changed files with 4340 additions and 3913 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/autodownload.cpp
+2 -1
View File
@@ -76,7 +76,8 @@ int pingpckserver(void *data) // fetch updates.txt from a media server, measure
u.set(s->host);
s->resolved = h.set_host(u.domain) ? 1 : 0;
SDL_mutexP(pckpinglog_lock);
cvecprintf(pckping_log, "lresolving hostname %s %s (%s)\n", u.domain, s->resolved ? "succeeded" : "failed", iptoa(ntohl(h.ip.host)));
string b;
cvecprintf(pckping_log, "lresolving hostname %s %s (%s)\n", u.domain, s->resolved ? "succeeded" : "failed", iptoa(ENET_NET_TO_HOST_32(h.ip.host), b));
SDL_mutexV(pckpinglog_lock);
if(s->resolved)
{