From be27f06b766e06f2a7321ebba31f5244fe407047 Mon Sep 17 00:00:00 2001 From: Spoike Date: Fri, 1 Mar 2019 22:53:51 +0000 Subject: [PATCH] Somehow failed to commit some changes. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5420 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/cl_main.c | 4 ++-- engine/server/sv_main.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c index 754b4451b..ab210e5a5 100644 --- a/engine/client/cl_main.c +++ b/engine/client/cl_main.c @@ -668,7 +668,7 @@ void CL_SendConnectPacket (netadr_t *to, int mtu, InfoBuf_ToString(&cls.userinfo[0], data+strlen(data), sizeof(data)-strlen(data), prioritykeys, NULL, NULL, &cls.userinfosync, &cls.userinfo[0]); } if (connectinfo.protocol == CP_QUAKEWORLD) //zquake extension info. - Q_strncatz(data, va("\\*z_ext\\%i", SUPPORTED_Z_EXTENSIONS), sizeof(data)); + Q_strncatz(data, va("\\*z_ext\\%i", CLIENT_SUPPORTED_Z_EXTENSIONS), sizeof(data)); Q_strncatz(data, "\"", sizeof(data)); @@ -2241,7 +2241,7 @@ void CL_CheckServerInfo(void) cls.allow_cheats = false; } - cls.z_ext = atoi(InfoBuf_ValueForKey(&cl.serverinfo, "*z_ext")); + cls.z_ext = atoi(InfoBuf_ValueForKey(&cl.serverinfo, "*z_ext")) & CLIENT_SUPPORTED_Z_EXTENSIONS; #ifdef NQPROT if (cls.protocol == CP_NETQUAKE && CPNQ_IS_DP) diff --git a/engine/server/sv_main.c b/engine/server/sv_main.c index 186f69d73..8f11c3e76 100644 --- a/engine/server/sv_main.c +++ b/engine/server/sv_main.c @@ -3071,7 +3071,7 @@ client_t *SVC_DirectConnect(void) { //so switch on the bits that it should be sending. newcl->zquake_extensions |= Z_EXT_PM_TYPE|Z_EXT_PM_TYPE_NEW; } - newcl->zquake_extensions &= SUPPORTED_Z_EXTENSIONS; + newcl->zquake_extensions &= SERVER_SUPPORTED_Z_EXTENSIONS; //ezquake's download mechanism is so smegging buggy. //its causing far far far too many connectivity issues. seriously. its beyond a joke. I cannot stress that enough. @@ -5310,7 +5310,7 @@ void SV_InitLocal (void) svs.info.ChangeCB = SV_InfoChanged; svs.info.ChangeCTX = &svs.info; InfoBuf_SetValueForStarKey (&svs.info, "*version", version_string()); - InfoBuf_SetValueForStarKey (&svs.info, "*z_ext", va("%i", SUPPORTED_Z_EXTENSIONS)); + InfoBuf_SetValueForStarKey (&svs.info, "*z_ext", va("%i", SERVER_SUPPORTED_Z_EXTENSIONS)); // init fraglog stuff svs.logsequence = 1;