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

Added QTV colouring and stuph.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1391 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-09-28 23:37:15 +00:00
parent 5845f5a2d6
commit b9bc54f3a4
2 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
engine/client/m_master.c
View file

@ -39,6 +39,9 @@ cvar_t sb_showtimelimit = {"sb_showtimelimit", "0", NULL, CVAR_ARCHIVE};
cvar_t sb_filterkey = {"sb_filterkey", "hostname", NULL, CVAR_ARCHIVE}; cvar_t sb_filterkey = {"sb_filterkey", "hostname", NULL, CVAR_ARCHIVE};
cvar_t sb_filtervalue = {"sb_filtervalue", "", NULL, CVAR_ARCHIVE}; cvar_t sb_filtervalue = {"sb_filtervalue", "", NULL, CVAR_ARCHIVE};
extern cvar_t slist_writeserverstxt;
extern cvar_t slist_cacheinfo;
void M_Serverlist_Init(void) void M_Serverlist_Init(void)
{ {
char *grp = "Server Browser Vars"; char *grp = "Server Browser Vars";
@ -63,6 +66,9 @@ void M_Serverlist_Init(void)
Cvar_Register(&sb_showplayers, grp); Cvar_Register(&sb_showplayers, grp);
Cvar_Register(&sb_showfraglimit, grp); Cvar_Register(&sb_showfraglimit, grp);
Cvar_Register(&sb_showtimelimit, grp); Cvar_Register(&sb_showtimelimit, grp);
Cvar_Register(&slist_writeserverstxt, grp);
Cvar_Register(&slist_cacheinfo, grp);
} }
@ -367,9 +373,7 @@ void M_DrawServerList(void)
blink = (int)(realtime*3)&1; blink = (int)(realtime*3)&1;
if (*server->name) if (*server->name)
{ {
if (blink) if (server->special & SS_FAVORITE)
colour = COLOR_CYAN;
else if (server->special & SS_FAVORITE)
colour = COLOR_GREEN; colour = COLOR_GREEN;
else if (server->special & SS_FTESERVER) else if (server->special & SS_FTESERVER)
colour = COLOR_RED; colour = COLOR_RED;
@ -378,10 +382,20 @@ void M_DrawServerList(void)
else if (server->special & SS_QUAKE3) else if (server->special & SS_QUAKE3)
colour = COLOR_BLUE; colour = COLOR_BLUE;
else if (server->special & SS_NETQUAKE) else if (server->special & SS_NETQUAKE)
colour = COLOR_WHITE;
else if (server->special & SS_QTV)
colour = COLOR_MAGENTA; colour = COLOR_MAGENTA;
else else
colour = COLOR_WHITE; colour = COLOR_WHITE;
if (blink)
{
if (server->special & SS_NETQUAKE)
colour = COLOR_MAGENTA; //nq blinks magenta
else
colour = COLOR_CYAN;
}
x = vid.width; x = vid.width;
if (sb_showtimelimit.value) if (sb_showtimelimit.value)

12
engine/client/net_master.c
View file

@ -1095,6 +1095,9 @@ void MasterInfo_WriteServers(void)
case MT_MASTERDP: case MT_MASTERDP:
typename = "master:dp"; typename = "master:dp";
break; break;
case MT_MASTERHTTP:
typename = "master:http";
break;
case MT_BCASTQW: case MT_BCASTQW:
typename = "bcast:qw"; typename = "bcast:qw";
break; break;
@ -1119,9 +1122,15 @@ void MasterInfo_WriteServers(void)
case MT_SINGLENQ: case MT_SINGLENQ:
typename = "single:nq"; typename = "single:nq";
break; break;
case MT_SINGLEDP:
typename = "single:dp";
break;
default: default:
typename = "writeerror"; typename = "writeerror";
} }
if (mast->address)
fprintf(mf, "%s\t%s\t%s\n", mast->address , typename, mast->name);
else
fprintf(mf, "%s\t%s\t%s\n", NET_AdrToString(mast->adr), typename, mast->name); fprintf(mf, "%s\t%s\t%s\n", NET_AdrToString(mast->adr), typename, mast->name);
} }
@ -1424,6 +1433,9 @@ int CL_ReadServerInfo(char *msg, int servertype, qboolean favorite)
info->tl = atoi(Info_ValueForKey(msg, "timelimit")); info->tl = atoi(Info_ValueForKey(msg, "timelimit"));
info->fl = atoi(Info_ValueForKey(msg, "fraglimit")); info->fl = atoi(Info_ValueForKey(msg, "fraglimit"));
if (*Info_ValueForKey(msg, "*qtv"))
info->special |= SS_QTV;
if (servertype == MT_SINGLEQ3 || servertype == MT_SINGLEQ2 || servertype == MT_SINGLEDP) if (servertype == MT_SINGLEQ3 || servertype == MT_SINGLEQ2 || servertype == MT_SINGLEDP)
{ {
Q_strncpyz(info->gamedir, Info_ValueForKey(msg, "gamename"), sizeof(info->gamedir)); Q_strncpyz(info->gamedir, Info_ValueForKey(msg, "gamename"), sizeof(info->gamedir));