qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-12 23:54:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

back port the info key fix from 0.5. This should take care of the team

Browse source 
kicking.
This commit is contained in:
Bill Currie 2001-08-12 03:45:37 +00:00
parent 6714119351
commit f4dc013a3d
14 changed files with 53 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/info.h
View file

@ -45,8 +45,8 @@ qboolean Info_FilterForKey (const char *key);
void Info_Print (char *s); void Info_Print (char *s);
void Info_RemoveKey (char *s, char *key); void Info_RemoveKey (char *s, char *key);
void Info_RemovePrefixedKeys (char *start, char prefix); void Info_RemovePrefixedKeys (char *start, char prefix);
void Info_SetValueForKey (char *s, char *key, char *value, size_t maxsize); void Info_SetValueForKey (char *s, char *key, char *value, size_t maxsize, int flags);
void Info_SetValueForStarKey (char *s, char *key, char *value, size_t maxsize); void Info_SetValueForStarKey (char *s, char *key, char *value, size_t maxsize, int flags);
char *Info_ValueForKey (char *s, char *key); char *Info_ValueForKey (char *s, char *key);
qboolean Info_Validate (char *s); qboolean Info_Validate (char *s);

2
include/server.h
View file

@ -370,6 +370,8 @@ typedef enum
//============================================================================ //============================================================================
// FIXME: declare exported variables in their own relevant .h // FIXME: declare exported variables in their own relevant .h
extern struct cvar_s *sv_highchars;
extern cvar_t *sv_mintic, *sv_maxtic; extern cvar_t *sv_mintic, *sv_maxtic;
extern cvar_t *sv_maxspeed; extern cvar_t *sv_maxspeed;

5
source/cl_cvar.c
View file

@ -31,6 +31,7 @@
#endif #endif
#include "client.h" #include "client.h"
#include "compat.h"
#include "cvar.h" #include "cvar.h"
#include "msg.h" #include "msg.h"
#include "va.h" #include "va.h"
@ -40,7 +41,9 @@ Cvar_Info (cvar_t *var)
{ {
if (var->flags & CVAR_USERINFO) { if (var->flags & CVAR_USERINFO) {
Info_SetValueForKey (cls.userinfo, var->name, var->string, Info_SetValueForKey (cls.userinfo, var->name, var->string,
MAX_INFO_STRING); MAX_INFO_STRING,
((!strequal(var->name, "name"))
|(strequal(var->name,"team") << 1)));
if (cls.state >= ca_connected) { if (cls.state >= ca_connected) {
MSG_WriteByte (&cls.netchan.message, clc_stringcmd); MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
MSG_WriteString (&cls.netchan.message, MSG_WriteString (&cls.netchan.message,

25
source/cl_main.c
View file

@ -651,11 +651,11 @@ CL_AddQFInfoKeys (void)
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
strncat (cap, "z", sizeof (cap) - strlen (cap) - 1); strncat (cap, "z", sizeof (cap) - strlen (cap) - 1);
#endif #endif
Info_SetValueForStarKey (cls.userinfo, "*cap", cap, MAX_INFO_STRING); Info_SetValueForStarKey (cls.userinfo, "*cap", cap, MAX_INFO_STRING, 0);
Info_SetValueForStarKey (cls.userinfo, "*qf_version", VERSION, Info_SetValueForStarKey (cls.userinfo, "*qf_version", VERSION,
MAX_INFO_STRING); MAX_INFO_STRING, 0);
Info_SetValueForStarKey (cls.userinfo, "*qsg_version", QSG_VERSION, Info_SetValueForStarKey (cls.userinfo, "*qsg_version", QSG_VERSION,
MAX_INFO_STRING); MAX_INFO_STRING, 0);
Con_Printf ("QuakeForge server detected\n"); Con_Printf ("QuakeForge server detected\n");
} }
@ -717,7 +717,9 @@ CL_FullInfo_f (void)
if (strcaseequal (key, pmodel_name) || strcaseequal (key, emodel_name)) if (strcaseequal (key, pmodel_name) || strcaseequal (key, emodel_name))
continue; continue;
Info_SetValueForKey (cls.userinfo, key, value, MAX_INFO_STRING); Info_SetValueForKey (cls.userinfo, key, value, MAX_INFO_STRING,
(!strequal (key, "name"))
| (strequal (key, "team") << 1));
} }
} }
@ -742,7 +744,8 @@ CL_SetInfo_f (void)
return; return;
Info_SetValueForKey (cls.userinfo, Cmd_Argv (1), Cmd_Argv (2), Info_SetValueForKey (cls.userinfo, Cmd_Argv (1), Cmd_Argv (2),
MAX_INFO_STRING); MAX_INFO_STRING, (!strequal (Cmd_Argv (1), "name"))
| (strequal (Cmd_Argv (2), "team") << 1));
if (cls.state >= ca_connected) if (cls.state >= ca_connected)
Cmd_ForwardToServer (); Cmd_ForwardToServer ();
} }
@ -1143,14 +1146,14 @@ CL_Init (void)
cls.state = ca_disconnected; cls.state = ca_disconnected;
Info_SetValueForKey (cls.userinfo, "name", "unnamed", MAX_INFO_STRING); Info_SetValueForKey (cls.userinfo, "name", "unnamed", MAX_INFO_STRING, 0);
Info_SetValueForKey (cls.userinfo, "topcolor", "0", MAX_INFO_STRING); Info_SetValueForKey (cls.userinfo, "topcolor", "0", MAX_INFO_STRING, 0);
Info_SetValueForKey (cls.userinfo, "bottomcolor", "0", MAX_INFO_STRING); Info_SetValueForKey (cls.userinfo, "bottomcolor", "0", MAX_INFO_STRING, 0);
Info_SetValueForKey (cls.userinfo, "rate", "2500", MAX_INFO_STRING); Info_SetValueForKey (cls.userinfo, "rate", "2500", MAX_INFO_STRING, 0);
Info_SetValueForKey (cls.userinfo, "msg", "1", MAX_INFO_STRING); Info_SetValueForKey (cls.userinfo, "msg", "1", MAX_INFO_STRING, 0);
// snprintf (st, sizeof(st), "%s-%04d", QW_VERSION, build_number()); // snprintf (st, sizeof(st), "%s-%04d", QW_VERSION, build_number());
snprintf (st, sizeof (st), "%s", QW_VERSION); snprintf (st, sizeof (st), "%s", QW_VERSION);
Info_SetValueForStarKey (cls.userinfo, "*ver", st, MAX_INFO_STRING); Info_SetValueForStarKey (cls.userinfo, "*ver", st, MAX_INFO_STRING, 0);
#ifdef PACKET_LOGGING #ifdef PACKET_LOGGING
Net_Log_Init(); Net_Log_Init();
#endif #endif

6
source/cl_parse.c
View file

@ -1034,7 +1034,8 @@ CL_SetInfo (void)
Con_DPrintf ("SETINFO %s: %s=%s\n", player->name, key, value); Con_DPrintf ("SETINFO %s: %s=%s\n", player->name, key, value);
Info_SetValueForKey (player->userinfo, key, value, MAX_INFO_STRING); Info_SetValueForKey (player->userinfo, key, value, MAX_INFO_STRING,
(!strequal (key, "name"))| (strequal (key, "team") << 1));
CL_ProcessUserInfo (slot, player); CL_ProcessUserInfo (slot, player);
} }
@ -1055,7 +1056,8 @@ CL_ServerInfo (void)
Con_DPrintf ("SERVERINFO: %s=%s\n", key, value); Con_DPrintf ("SERVERINFO: %s=%s\n", key, value);
Info_SetValueForKey (cl.serverinfo, key, value, MAX_SERVERINFO_STRING); Info_SetValueForKey (cl.serverinfo, key, value, MAX_SERVERINFO_STRING,
(!strequal (key, "name"))| (strequal (key, "team") << 1));
} }
/* /*

14
source/info.c
View file

@ -216,10 +216,10 @@ Info_RemovePrefixedKeys (char *start, char prefix)
void void
Info_SetValueForStarKey (char *s, char *key, char *value, size_t maxsize) Info_SetValueForStarKey (char *s, char *key, char *value, size_t maxsize, int flags)
{ {
char newstr[1024], *v; char newstr[1024], *v;
int c, is_name, is_team; int c;
if (strstr (key, "\\") || strstr (value, "\\")) { if (strstr (key, "\\") || strstr (value, "\\")) {
Con_Printf ("Can't use keys or values with a \\\n"); Con_Printf ("Can't use keys or values with a \\\n");
@ -258,17 +258,15 @@ Info_SetValueForStarKey (char *s, char *key, char *value, size_t maxsize)
// only copy ascii values // only copy ascii values
s += strlen (s); s += strlen (s);
v = newstr; v = newstr;
is_name = strcaseequal (key, "name");
is_team = strcaseequal (key, "team");
while (*v) { while (*v) {
c = (unsigned char) *v++; c = (unsigned char) *v++;
// client only allows highbits on name // client only allows highbits on name
if (!is_name) { if (flags & 1) {
c &= 127; c &= 127;
if (c < 32 || c > 127) if (c < 32 || c > 127)
continue; continue;
// auto lowercase team // auto lowercase team
if (is_team) if (flags & 2)
c = tolower (c); c = tolower (c);
} }
if (c > 13) if (c > 13)
@ -278,14 +276,14 @@ Info_SetValueForStarKey (char *s, char *key, char *value, size_t maxsize)
} }
void void
Info_SetValueForKey (char *s, char *key, char *value, size_t maxsize) Info_SetValueForKey (char *s, char *key, char *value, size_t maxsize, int flags)
{ {
if (key[0] == '*') { if (key[0] == '*') {
Con_Printf ("Can't set * keys\n"); Con_Printf ("Can't set * keys\n");
return; return;
} }
Info_SetValueForStarKey (s, key, value, maxsize); Info_SetValueForStarKey (s, key, value, maxsize, flags);
} }
void void

2
source/model_alias.c
View file

@ -109,7 +109,7 @@ Mod_LoadAliasModel (model_t *mod, void *buffer)
Info_SetValueForKey (cls.userinfo, Info_SetValueForKey (cls.userinfo,
!strcmp (loadmodel->name, !strcmp (loadmodel->name,
"progs/player.mdl") ? pmodel_name : "progs/player.mdl") ? pmodel_name :
emodel_name, st, MAX_INFO_STRING); emodel_name, st, MAX_INFO_STRING, 0);
if (cls.state >= ca_connected) { if (cls.state >= ca_connected) {
MSG_WriteByte (&cls.netchan.message, clc_stringcmd); MSG_WriteByte (&cls.netchan.message, clc_stringcmd);

2
source/quakefs.c
View file

@ -1026,7 +1026,7 @@ COM_Gamedir_f (void)
if (is_server) { if (is_server) {
Info_SetValueForStarKey (svs_info, "*gamedir", dir, Info_SetValueForStarKey (svs_info, "*gamedir", dir,
MAX_SERVERINFO_STRING); MAX_SERVERINFO_STRING, 0);
} }
} }

8
source/sv_ccmds.c
View file

@ -555,7 +555,7 @@ SV_Serverinfo_f (void)
return; return;
} }
Info_SetValueForKey (svs.info, Cmd_Argv (1), Cmd_Argv (2), Info_SetValueForKey (svs.info, Cmd_Argv (1), Cmd_Argv (2),
MAX_SERVERINFO_STRING); MAX_SERVERINFO_STRING, !sv_highchars->int_val);
// if this is a cvar, change it too // if this is a cvar, change it too
var = Cvar_FindVar (Cmd_Argv (1)); var = Cvar_FindVar (Cmd_Argv (1));
@ -593,7 +593,7 @@ SV_Localinfo_f (void)
return; return;
} }
Info_SetValueForKey (localinfo, Cmd_Argv (1), Cmd_Argv (2), Info_SetValueForKey (localinfo, Cmd_Argv (1), Cmd_Argv (2),
MAX_LOCALINFO_STRING); MAX_LOCALINFO_STRING, !sv_highchars->int_val);
} }
@ -645,7 +645,7 @@ SV_Gamedir (void)
return; return;
} }
Info_SetValueForStarKey (svs.info, "*gamedir", dir, MAX_SERVERINFO_STRING); Info_SetValueForStarKey (svs.info, "*gamedir", dir, MAX_SERVERINFO_STRING, !sv_highchars->int_val);
} }
/* /*
@ -804,7 +804,7 @@ SV_InitOperatorCommands (void)
if (COM_CheckParm ("-cheats")) { if (COM_CheckParm ("-cheats")) {
sv_allow_cheats = true; sv_allow_cheats = true;
Info_SetValueForStarKey (svs.info, "*cheats", "ON", Info_SetValueForStarKey (svs.info, "*cheats", "ON",
MAX_SERVERINFO_STRING); MAX_SERVERINFO_STRING, !sv_highchars->int_val);
} }
Cmd_AddCommand ("logfile", SV_Logfile_f, "Toggles logging of console text to qconsole.log"); Cmd_AddCommand ("logfile", SV_Logfile_f, "Toggles logging of console text to qconsole.log");

6
source/sv_cvar.c
View file

@ -35,8 +35,6 @@
void SV_SendServerInfoChange (char *key, char *value); void SV_SendServerInfoChange (char *key, char *value);
extern cvar_t *sv_highchars;
/* /*
Cvar_Info Cvar_Info
@ -62,10 +60,10 @@ Cvar_Info (cvar_t *var)
} }
*p = 0; *p = 0;
Info_SetValueForKey (svs.info, var->name, info, Info_SetValueForKey (svs.info, var->name, info,
MAX_SERVERINFO_STRING); MAX_SERVERINFO_STRING, !sv_highchars->int_val);
} else } else
Info_SetValueForKey (svs.info, var->name, var->string, Info_SetValueForKey (svs.info, var->name, var->string,
MAX_SERVERINFO_STRING); MAX_SERVERINFO_STRING, !sv_highchars->int_val);
SV_SendServerInfoChange (var->name, var->string); SV_SendServerInfoChange (var->name, var->string);
// SV_BroadcastCommand ("fullserverinfo \"%s\"\n", svs.info); // SV_BroadcastCommand ("fullserverinfo \"%s\"\n", svs.info);

4
source/sv_init.c
View file

@ -336,7 +336,7 @@ SV_SpawnServer (char *server)
// which determines how big each edict is // which determines how big each edict is
SV_LoadProgs (); SV_LoadProgs ();
Info_SetValueForStarKey (svs.info, "*progs", va ("%i", sv_pr_state.crc), Info_SetValueForStarKey (svs.info, "*progs", va ("%i", sv_pr_state.crc),
MAX_SERVERINFO_STRING); MAX_SERVERINFO_STRING, !sv_highchars->int_val);
// allocate edicts // allocate edicts
sv.edicts = Hunk_AllocName (MAX_EDICTS * sv_pr_state.pr_edict_size, "edicts"); sv.edicts = Hunk_AllocName (MAX_EDICTS * sv_pr_state.pr_edict_size, "edicts");
@ -422,6 +422,6 @@ SV_SpawnServer (char *server)
SV_CreateBaseline (); SV_CreateBaseline ();
sv.signon_buffer_size[sv.num_signon_buffers - 1] = sv.signon.cursize; sv.signon_buffer_size[sv.num_signon_buffers - 1] = sv.signon.cursize;
Info_SetValueForKey (svs.info, "map", sv.name, MAX_SERVERINFO_STRING); Info_SetValueForKey (svs.info, "map", sv.name, MAX_SERVERINFO_STRING, !sv_highchars->int_val);
Con_DPrintf ("Server spawned.\n"); Con_DPrintf ("Server spawned.\n");
} }

18
source/sv_main.c
View file

@ -714,7 +714,7 @@ SVC_DirectConnect (void)
return; return;
} }
Info_RemoveKey (userinfo, "spectator"); // remove passwd Info_RemoveKey (userinfo, "spectator"); // remove passwd
Info_SetValueForStarKey (userinfo, "*spectator", "1", MAX_INFO_STRING); Info_SetValueForStarKey (userinfo, "*spectator", "1", MAX_INFO_STRING, !sv_highchars->int_val);
spectator = true; spectator = true;
} else { } else {
s = Info_ValueForKey (userinfo, "password"); s = Info_ValueForKey (userinfo, "password");
@ -1402,10 +1402,10 @@ SV_CheckVars (void)
Con_Printf ("Updated needpass.\n"); Con_Printf ("Updated needpass.\n");
if (!v) if (!v)
Info_SetValueForKey (svs.info, "needpass", "", MAX_SERVERINFO_STRING); Info_SetValueForKey (svs.info, "needpass", "", MAX_SERVERINFO_STRING, !sv_highchars->int_val);
else else
Info_SetValueForKey (svs.info, "needpass", va ("%i", v), Info_SetValueForKey (svs.info, "needpass", va ("%i", v),
MAX_SERVERINFO_STRING); MAX_SERVERINFO_STRING, !sv_highchars->int_val);
} }
/* /*
@ -1606,13 +1606,13 @@ SV_InitLocal (void)
snprintf (localmodels[i], sizeof (localmodels[i]), "*%i", i); snprintf (localmodels[i], sizeof (localmodels[i]), "*%i", i);
Info_SetValueForStarKey (svs.info, "*version", QW_VERSION, Info_SetValueForStarKey (svs.info, "*version", QW_VERSION,
MAX_SERVERINFO_STRING); MAX_SERVERINFO_STRING, !sv_highchars->int_val);
// Brand server as QF, with appropriate QSG standards version --KB // Brand server as QF, with appropriate QSG standards version --KB
Info_SetValueForStarKey (svs.info, "*qf_version", VERSION, Info_SetValueForStarKey (svs.info, "*qf_version", VERSION,
MAX_SERVERINFO_STRING); MAX_SERVERINFO_STRING, !sv_highchars->int_val);
Info_SetValueForStarKey (svs.info, "*qsg_version", QSG_VERSION, Info_SetValueForStarKey (svs.info, "*qsg_version", QSG_VERSION,
MAX_SERVERINFO_STRING); MAX_SERVERINFO_STRING, !sv_highchars->int_val);
// init fraglog stuff // init fraglog stuff
svs.logsequence = 1; svs.logsequence = 1;
@ -1733,12 +1733,12 @@ SV_ExtractFromUserinfo (client_t *cl)
p[1] = 0; p[1] = 0;
if (strcmp (val, newname)) { if (strcmp (val, newname)) {
Info_SetValueForKey (cl->userinfo, "name", newname, MAX_INFO_STRING); Info_SetValueForKey (cl->userinfo, "name", newname, MAX_INFO_STRING, !sv_highchars->int_val);
val = Info_ValueForKey (cl->userinfo, "name"); val = Info_ValueForKey (cl->userinfo, "name");
} }
if (!val[0] || strcaseequal (val, "console")) { if (!val[0] || strcaseequal (val, "console")) {
Info_SetValueForKey (cl->userinfo, "name", "unnamed", MAX_INFO_STRING); Info_SetValueForKey (cl->userinfo, "name", "unnamed", MAX_INFO_STRING, !sv_highchars->int_val);
val = Info_ValueForKey (cl->userinfo, "name"); val = Info_ValueForKey (cl->userinfo, "name");
} }
// check to see if another user by the same name exists // check to see if another user by the same name exists
@ -1763,7 +1763,7 @@ SV_ExtractFromUserinfo (client_t *cl)
snprintf (newname, sizeof (newname), "(%d)%-.40s", dupc++, p); snprintf (newname, sizeof (newname), "(%d)%-.40s", dupc++, p);
Info_SetValueForKey (cl->userinfo, "name", newname, Info_SetValueForKey (cl->userinfo, "name", newname,
MAX_INFO_STRING); MAX_INFO_STRING, !sv_highchars->int_val);
val = Info_ValueForKey (cl->userinfo, "name"); val = Info_ValueForKey (cl->userinfo, "name");
// if the new name was not set (due to the info string being too long), drop the client to prevent an infinite loop // if the new name was not set (due to the info string being too long), drop the client to prevent an infinite loop

2
source/sv_progs.c
View file

@ -124,7 +124,7 @@ ED_Parse_Extra_Fields (progs_t *pr, char *key, char *value)
|| strcaseequal (key, "skyname") || strcaseequal (key, "skyname")
|| strcaseequal (key, "qlsky")) { || strcaseequal (key, "qlsky")) {
Info_SetValueForKey (svs.info, "skybox", Info_SetValueForKey (svs.info, "skybox",
"1", MAX_SERVERINFO_STRING); "1", MAX_SERVERINFO_STRING, !sv_highchars->int_val);
Cvar_Set (r_skyname, value); Cvar_Set (r_skyname, value);
return 1; return 1;
} }

2
source/sv_user.c
View file

@ -1120,7 +1120,7 @@ SV_SetInfo_f (void)
strcpy (oldval, Info_ValueForKey (host_client->userinfo, Cmd_Argv (1))); strcpy (oldval, Info_ValueForKey (host_client->userinfo, Cmd_Argv (1)));
Info_SetValueForKey (host_client->userinfo, Cmd_Argv (1), Cmd_Argv (2), Info_SetValueForKey (host_client->userinfo, Cmd_Argv (1), Cmd_Argv (2),
MAX_INFO_STRING); MAX_INFO_STRING, !sv_highchars->int_val);
// name is extracted below in ExtractFromUserInfo // name is extracted below in ExtractFromUserInfo
// strncpy (host_client->name, Info_ValueForKey (host_client->userinfo, "name") // strncpy (host_client->name, Info_ValueForKey (host_client->userinfo, "name")
// , sizeof(host_client->name)-1); // , sizeof(host_client->name)-1);