Merge branch 'httpsource-without-curl' into 'master'

Let servers send httpsource without curl

See merge request KartKrew/Kart-Public!196
This commit is contained in:
Sal 2020-08-19 20:36:06 -04:00
commit c6f85cde59

View file

@ -1309,10 +1309,8 @@ static boolean CL_SendJoin(void)
static void SV_SendServerInfo(INT32 node, tic_t servertime) static void SV_SendServerInfo(INT32 node, tic_t servertime)
{ {
UINT8 *p; UINT8 *p;
#ifdef HAVE_CURL
size_t mirror_length; size_t mirror_length;
const char *httpurl = cv_httpsource.string; const char *httpurl = cv_httpsource.string;
#endif
netbuffer->packettype = PT_SERVERINFO; netbuffer->packettype = PT_SERVERINFO;
netbuffer->u.serverinfo._255 = 255; netbuffer->u.serverinfo._255 = 255;
@ -1401,7 +1399,6 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
netbuffer->u.serverinfo.actnum = 0; //mapheaderinfo[gamemap-1]->actnum netbuffer->u.serverinfo.actnum = 0; //mapheaderinfo[gamemap-1]->actnum
#ifdef HAVE_CURL
mirror_length = strlen(httpurl); mirror_length = strlen(httpurl);
if (mirror_length > MAX_MIRROR_LENGTH) if (mirror_length > MAX_MIRROR_LENGTH)
mirror_length = MAX_MIRROR_LENGTH; mirror_length = MAX_MIRROR_LENGTH;
@ -1411,7 +1408,6 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
strncpy(netbuffer->u.serverinfo.httpsource, "", mirror_length); strncpy(netbuffer->u.serverinfo.httpsource, "", mirror_length);
netbuffer->u.serverinfo.httpsource[MAX_MIRROR_LENGTH-1] = '\0'; netbuffer->u.serverinfo.httpsource[MAX_MIRROR_LENGTH-1] = '\0';
#endif
p = PutFileNeeded(0); p = PutFileNeeded(0);