diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c index 8cf49c101..5b52b15e9 100644 --- a/engine/client/cl_main.c +++ b/engine/client/cl_main.c @@ -1572,7 +1572,6 @@ void CL_CheckServerInfo(void) cls.allow_watervis=false; cls.allow_skyboxes=false; cls.allow_mirrors=false; - cls.allow_luma=false; cls.allow_postproc=false; cls.allow_fbskins = 1; // cls.allow_fbskins = 0; @@ -1589,10 +1588,6 @@ void CL_CheckServerInfo(void) if (cl.spectator || cls.demoplayback || atoi(Info_ValueForKey(cl.serverinfo, "mirrors"))) cls.allow_mirrors=true; - s = Info_ValueForKey(cl.serverinfo, "allow_luma"); - if (cl.spectator || cls.demoplayback || !*s || atoi(s)) - cls.allow_luma=true; - if (cl.spectator || cls.demoplayback || atoi(Info_ValueForKey(cl.serverinfo, "allow_lmgamma"))) cls.allow_lightmapgamma=true; @@ -1666,8 +1661,7 @@ void CL_CheckServerInfo(void) if (allowed & 8) cls.allow_mirrors = true; //16 - if (allowed & 32) - cls.allow_luma = true; + //32 if (allowed & 128) cls.allow_postproc = true; if (allowed & 256) @@ -2766,6 +2760,8 @@ void CL_ReadPackets (void) if (!cls.demoplayback && !NET_CompareAdr (&net_from, &cls.netchan.remote_address)) { + if (NET_WasSpecialPacket(NS_CLIENT)) + continue; Con_DPrintf ("%s:sequenced packet from wrong server\n" ,NET_AdrToString(adr, sizeof(adr), &net_from)); continue; diff --git a/engine/client/client.h b/engine/client/client.h index 19550e9e1..ae71f4834 100644 --- a/engine/client/client.h +++ b/engine/client/client.h @@ -425,7 +425,6 @@ typedef struct qboolean allow_skyboxes; qboolean allow_mirrors; qboolean allow_watervis; - qboolean allow_luma; float allow_fbskins; //fraction of allowance qboolean allow_postproc; qboolean allow_cheats; diff --git a/engine/client/sys_win.c b/engine/client/sys_win.c index b7ccf2175..c09f13d23 100644 --- a/engine/client/sys_win.c +++ b/engine/client/sys_win.c @@ -1299,6 +1299,10 @@ void Sys_SendKeyEvents (void) { MSG msg; +#ifdef _MSC_VER +#define strtoull _strtoui64 +#endif + if (isPlugin) { DWORD avail;