eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Client no longer used allow_luma for anything. don't bother parsing it.

Browse source 
fix for msvc

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4410 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2013-06-26 03:40:39 +00:00
parent 619b571da0
commit de000eb969
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
engine/client/cl_main.c
View file

@ -1572,7 +1572,6 @@ void CL_CheckServerInfo(void)
cls.allow_watervis=false; cls.allow_watervis=false;
cls.allow_skyboxes=false; cls.allow_skyboxes=false;
cls.allow_mirrors=false; cls.allow_mirrors=false;
cls.allow_luma=false;
cls.allow_postproc=false; cls.allow_postproc=false;
cls.allow_fbskins = 1; cls.allow_fbskins = 1;
// cls.allow_fbskins = 0; // cls.allow_fbskins = 0;
@ -1589,10 +1588,6 @@ void CL_CheckServerInfo(void)
if (cl.spectator || cls.demoplayback || atoi(Info_ValueForKey(cl.serverinfo, "mirrors"))) if (cl.spectator || cls.demoplayback || atoi(Info_ValueForKey(cl.serverinfo, "mirrors")))
cls.allow_mirrors=true; 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"))) if (cl.spectator || cls.demoplayback || atoi(Info_ValueForKey(cl.serverinfo, "allow_lmgamma")))
cls.allow_lightmapgamma=true; cls.allow_lightmapgamma=true;
@ -1666,8 +1661,7 @@ void CL_CheckServerInfo(void)
if (allowed & 8) if (allowed & 8)
cls.allow_mirrors = true; cls.allow_mirrors = true;
//16 //16
if (allowed & 32) //32
cls.allow_luma = true;
if (allowed & 128) if (allowed & 128)
cls.allow_postproc = true; cls.allow_postproc = true;
if (allowed & 256) if (allowed & 256)
@ -2766,6 +2760,8 @@ void CL_ReadPackets (void)
if (!cls.demoplayback && if (!cls.demoplayback &&
!NET_CompareAdr (&net_from, &cls.netchan.remote_address)) !NET_CompareAdr (&net_from, &cls.netchan.remote_address))
{ {
if (NET_WasSpecialPacket(NS_CLIENT))
continue;
Con_DPrintf ("%s:sequenced packet from wrong server\n" Con_DPrintf ("%s:sequenced packet from wrong server\n"
,NET_AdrToString(adr, sizeof(adr), &net_from)); ,NET_AdrToString(adr, sizeof(adr), &net_from));
continue; continue;

1
engine/client/client.h
View file

@ -425,7 +425,6 @@ typedef struct
qboolean allow_skyboxes; qboolean allow_skyboxes;
qboolean allow_mirrors; qboolean allow_mirrors;
qboolean allow_watervis; qboolean allow_watervis;
qboolean allow_luma;
float allow_fbskins; //fraction of allowance float allow_fbskins; //fraction of allowance
qboolean allow_postproc; qboolean allow_postproc;
qboolean allow_cheats; qboolean allow_cheats;

4
engine/client/sys_win.c
View file

@ -1299,6 +1299,10 @@ void Sys_SendKeyEvents (void)
{ {
MSG msg; MSG msg;
#ifdef _MSC_VER
#define strtoull _strtoui64
#endif
if (isPlugin) if (isPlugin)
{ {
DWORD avail; DWORD avail;