fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-14 16:01:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

dropped CVAR_SERVERINFO flag from the cmdline cvar: sending cmdline upon

Browse source 
CCREQ_RULE_INFO is evil...
while I was there, did some whitespace clean-up in common.c.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@568 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2011-12-28 23:40:27 +00:00
parent 3d4901410c
commit 175a348297
1 changed files with 164 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Quake/common.c
View file

@ -29,7 +29,7 @@ static char argvdummy[] = " ";
int safemode; int safemode;
cvar_t registered = {"registered","0",CVAR_ROM}; cvar_t registered = {"registered","0",CVAR_ROM};
cvar_t cmdline = {"cmdline","",CVAR_ROM|CVAR_SERVERINFO}; /* sending cmdline upon CCREQ_RULE_INFO is evil... */ cvar_t cmdline = {"cmdline","",CVAR_ROM/*|CVAR_SERVERINFO*/}; /* sending cmdline upon CCREQ_RULE_INFO is evil */
qboolean com_modified; // set true if using non-id files qboolean com_modified; // set true if using non-id files
@ -47,35 +47,34 @@ char com_token[1024];
int com_argc; int com_argc;
char **com_argv; char **com_argv;
#define CMDLINE_LENGTH 256 //johnfitz -- mirrored in cmd.c #define CMDLINE_LENGTH 256 /* johnfitz -- mirrored in cmd.c */
char com_cmdline[CMDLINE_LENGTH]; char com_cmdline[CMDLINE_LENGTH];
qboolean standard_quake = true, rogue, hipnotic; qboolean standard_quake = true, rogue, hipnotic;
// this graphic needs to be in the pak file to use registered features // this graphic needs to be in the pak file to use registered features
unsigned short pop[] = static unsigned short pop[] =
{ {
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
,0x0000,0x0000,0x6600,0x0000,0x0000,0x0000,0x6600,0x0000 0x0000,0x0000,0x6600,0x0000,0x0000,0x0000,0x6600,0x0000,
,0x0000,0x0066,0x0000,0x0000,0x0000,0x0000,0x0067,0x0000 0x0000,0x0066,0x0000,0x0000,0x0000,0x0000,0x0067,0x0000,
,0x0000,0x6665,0x0000,0x0000,0x0000,0x0000,0x0065,0x6600 0x0000,0x6665,0x0000,0x0000,0x0000,0x0000,0x0065,0x6600,
,0x0063,0x6561,0x0000,0x0000,0x0000,0x0000,0x0061,0x6563 0x0063,0x6561,0x0000,0x0000,0x0000,0x0000,0x0061,0x6563,
,0x0064,0x6561,0x0000,0x0000,0x0000,0x0000,0x0061,0x6564 0x0064,0x6561,0x0000,0x0000,0x0000,0x0000,0x0061,0x6564,
,0x0064,0x6564,0x0000,0x6469,0x6969,0x6400,0x0064,0x6564 0x0064,0x6564,0x0000,0x6469,0x6969,0x6400,0x0064,0x6564,
,0x0063,0x6568,0x6200,0x0064,0x6864,0x0000,0x6268,0x6563 0x0063,0x6568,0x6200,0x0064,0x6864,0x0000,0x6268,0x6563,
,0x0000,0x6567,0x6963,0x0064,0x6764,0x0063,0x6967,0x6500 0x0000,0x6567,0x6963,0x0064,0x6764,0x0063,0x6967,0x6500,
,0x0000,0x6266,0x6769,0x6a68,0x6768,0x6a69,0x6766,0x6200 0x0000,0x6266,0x6769,0x6a68,0x6768,0x6a69,0x6766,0x6200,
,0x0000,0x0062,0x6566,0x6666,0x6666,0x6666,0x6562,0x0000 0x0000,0x0062,0x6566,0x6666,0x6666,0x6666,0x6562,0x0000,
,0x0000,0x0000,0x0062,0x6364,0x6664,0x6362,0x0000,0x0000 0x0000,0x0000,0x0062,0x6364,0x6664,0x6362,0x0000,0x0000,
,0x0000,0x0000,0x0000,0x0062,0x6662,0x0000,0x0000,0x0000 0x0000,0x0000,0x0000,0x0062,0x6662,0x0000,0x0000,0x0000,
,0x0000,0x0000,0x0000,0x0061,0x6661,0x0000,0x0000,0x0000 0x0000,0x0000,0x0000,0x0061,0x6661,0x0000,0x0000,0x0000,
,0x0000,0x0000,0x0000,0x0000,0x6500,0x0000,0x0000,0x0000 0x0000,0x0000,0x0000,0x0000,0x6500,0x0000,0x0000,0x0000,
,0x0000,0x0000,0x0000,0x0000,0x6400,0x0000,0x0000,0x0000 0x0000,0x0000,0x0000,0x0000,0x6400,0x0000,0x0000,0x0000
}; };
/* /*
All of Quake's data access is through a hierchal file system, but the contents All of Quake's data access is through a hierchal file system, but the contents
of the file system can be transparently merged from several sources. of the file system can be transparently merged from several sources.
@ -249,7 +248,10 @@ char *Q_strrchr(const char *s, char c)
int len = Q_strlen(s); int len = Q_strlen(s);
s += len; s += len;
while (len--) while (len--)
if (*--s == c) return (char *)s; {
if (*--s == c)
return (char *)s;
}
return NULL; return NULL;
} }
@ -604,7 +606,6 @@ void MSG_WriteFloat (sizebuf_t *sb, float f)
int l; int l;
} dat; } dat;
dat.f = f; dat.f = f;
dat.l = LittleLong (dat.l); dat.l = LittleLong (dat.l);
@ -814,7 +815,6 @@ float MSG_ReadAngle16 (void)
//johnfitz //johnfitz
//=========================================================================== //===========================================================================
void SZ_Alloc (sizebuf_t *buf, int startsize) void SZ_Alloc (sizebuf_t *buf, int startsize)
@ -1519,8 +1519,7 @@ static int COM_FindFile (const char *filename, int *handle, FILE **file,
searchpath_t *search; searchpath_t *search;
char netpath[MAX_OSPATH]; char netpath[MAX_OSPATH];
pack_t *pak; pack_t *pak;
int i; int i, findtime;
int findtime;
if (file && handle) if (file && handle)
Sys_Error ("COM_FindFile: both handle and file set"); Sys_Error ("COM_FindFile: both handle and file set");