fte
/
fteqw
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up some join / part comments. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2427 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2006-10-22 20:33:12 +00:00
parent ff5bf28f00
commit aa9105dae7
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fteqtv/qw.c
View File

@ -679,11 +679,17 @@ void NewClient(cluster_t *cluster, viewer_t *viewer)
QW_PrintfToViewer(viewer, "Type admin for the admin menu\n"); QW_PrintfToViewer(viewer, "Type admin for the admin menu\n");
} }
void ParseUserInfo(viewer_t *viewer) void ParseUserInfo(cluster_t *cluster, viewer_t *viewer)
{ {
float rate; float rate;
char temp[64]; char temp[64];
Info_ValueForKey(viewer->userinfo, "name", viewer->name, sizeof(viewer->name)); Info_ValueForKey(viewer->userinfo, "name", temp, sizeof(temp));
if (!*temp)
strcpy(temp, "unnamed");
if (!*viewer->name)
Sys_Printf(cluster, "Viewer %s connected\n", temp);
Q_strncpyz(viewer->name, temp, sizeof(temp));
Info_ValueForKey(viewer->userinfo, "rate", temp, sizeof(temp)); Info_ValueForKey(viewer->userinfo, "rate", temp, sizeof(temp));
rate = atof(temp); rate = atof(temp);
@ -769,7 +775,7 @@ void NewNQClient(cluster_t *cluster, netadr_t *addr)
sprintf(viewer->userinfo, "\\name\\%s", "unnamed"); sprintf(viewer->userinfo, "\\name\\%s", "unnamed");
ParseUserInfo(viewer); ParseUserInfo(cluster, viewer);
NewClient(cluster, viewer); NewClient(cluster, viewer);
@ -829,7 +835,7 @@ void NewQWClient(cluster_t *cluster, netadr_t *addr, char *connectmessage)
cluster->numviewers++; cluster->numviewers++;
strncpy(viewer->userinfo, infostring, sizeof(viewer->userinfo)-1); strncpy(viewer->userinfo, infostring, sizeof(viewer->userinfo)-1);
ParseUserInfo(viewer); ParseUserInfo(cluster, viewer);
Netchan_OutOfBandPrint(cluster, cluster->qwdsocket, *addr, "j"); Netchan_OutOfBandPrint(cluster, cluster->qwdsocket, *addr, "j");
@ -2603,7 +2609,7 @@ void ParseNQC(cluster_t *cluster, sv_t *qtv, viewer_t *v, netmsg_t *m)
} }
Info_SetValueForStarKey(v->userinfo, arg[1], arg[2], sizeof(v->userinfo)); Info_SetValueForStarKey(v->userinfo, arg[1], arg[2], sizeof(v->userinfo));
ParseUserInfo(v); ParseUserInfo(cluster, v);
// Info_ValueForKey(v->userinfo, "name", v->name, sizeof(v->name)); // Info_ValueForKey(v->userinfo, "name", v->name, sizeof(v->name));
if (v->server && v->server->controller == v) if (v->server && v->server->controller == v)
@ -2613,7 +2619,7 @@ void ParseNQC(cluster_t *cluster, sv_t *qtv, viewer_t *v, netmsg_t *m)
else if (!strncmp(buf, "name ", 5)) else if (!strncmp(buf, "name ", 5))
{ {
Info_SetValueForStarKey(v->userinfo, "name", buf+5, sizeof(v->userinfo)); Info_SetValueForStarKey(v->userinfo, "name", buf+5, sizeof(v->userinfo));
ParseUserInfo(v); ParseUserInfo(cluster, v);
if (v->server && v->server->controller == v) if (v->server && v->server->controller == v)
SendClientCommand(v->server, "setinfo name \"%s\"", v->name); SendClientCommand(v->server, "setinfo name \"%s\"", v->name);
@ -2658,6 +2664,8 @@ void ParseNQC(cluster_t *cluster, sv_t *qtv, viewer_t *v, netmsg_t *m)
} }
break; break;
case clc_disconnect: case clc_disconnect:
if (!v->drop)
Sys_Printf(cluster, "NQ viewer %s disconnects\n", v->name);
v->drop = true; v->drop = true;
return; return;
case clc_move: case clc_move:
@ -2870,7 +2878,11 @@ void ParseQWC(cluster_t *cluster, sv_t *qtv, viewer_t *v, netmsg_t *m)
SendBufferToViewer(v, m.data, m.cursize, true); SendBufferToViewer(v, m.data, m.cursize, true);
} }
else if (!strncmp(buf, "drop", 4)) else if (!strncmp(buf, "drop", 4))
{
if (!v->drop)
Sys_Printf(cluster, "QW viewer %s disconnects\n", v->name);
v->drop = true; v->drop = true;
}
else if (!strncmp(buf, "ison", 4)) else if (!strncmp(buf, "ison", 4))
{ {
viewer_t *other; viewer_t *other;
@ -2924,7 +2936,7 @@ void ParseQWC(cluster_t *cluster, sv_t *qtv, viewer_t *v, netmsg_t *m)
} }
Info_SetValueForStarKey(v->userinfo, arg[1], arg[2], sizeof(v->userinfo)); Info_SetValueForStarKey(v->userinfo, arg[1], arg[2], sizeof(v->userinfo));
ParseUserInfo(v); ParseUserInfo(cluster, v);
// Info_ValueForKey(v->userinfo, "name", v->name, sizeof(v->name)); // Info_ValueForKey(v->userinfo, "name", v->name, sizeof(v->name));
if (v->server && v->server->controller == v) if (v->server && v->server->controller == v)
@ -3008,6 +3020,7 @@ void ParseQWC(cluster_t *cluster, sv_t *qtv, viewer_t *v, netmsg_t *m)
break; break;
case clc_upload: case clc_upload:
Sys_Printf(cluster, "Client uploads are not supported from %s\n", v->name);
v->drop = true; v->drop = true;
return; return;
@ -3350,7 +3363,7 @@ void QW_FreeViewer(cluster_t *cluster, viewer_t *viewer)
int i; int i;
//note: unlink them yourself. //note: unlink them yourself.
Sys_Printf(cluster, "Dropping viewer %s\n", viewer->name); // Sys_Printf(cluster, "Dropping viewer %s\n", viewer->name);
//spam them thrice, then forget about them //spam them thrice, then forget about them
Netchan_Transmit(cluster, &viewer->netchan, strlen(dropcmd)+1, dropcmd); Netchan_Transmit(cluster, &viewer->netchan, strlen(dropcmd)+1, dropcmd);
@ -3567,7 +3580,7 @@ void QW_UpdateUDPStuff(cluster_t *cluster)
if (cluster->viewers && cluster->viewers->drop) if (cluster->viewers && cluster->viewers->drop)
{ {
Sys_Printf(cluster, "Dropping client\n"); // Sys_Printf(cluster, "Dropping viewer %s\n", v->name);
f = cluster->viewers; f = cluster->viewers;
cluster->viewers = f->next; cluster->viewers = f->next;
@ -3578,7 +3591,7 @@ void QW_UpdateUDPStuff(cluster_t *cluster)
{ {
if (v->next && v->next->drop) if (v->next && v->next->drop)
{ //free the next/ { //free the next/
Sys_Printf(cluster, "Dropping client\n"); // Sys_Printf(cluster, "Dropping viewer %s\n", v->name);
f = v->next; f = v->next;
v->next = f->next; v->next = f->next;
@ -3588,7 +3601,10 @@ void QW_UpdateUDPStuff(cluster_t *cluster)
v->drop |= v->netchan.drop; v->drop |= v->netchan.drop;
if (v->timeout < cluster->curtime) if (v->timeout < cluster->curtime)
{
Sys_Printf(cluster, "Viewer %s timed out\n", v->name);
v->drop = true; v->drop = true;
}
if (v->netchan.isnqprotocol) if (v->netchan.isnqprotocol)
{ {