nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-10 14:42:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix -window etc.

Browse source 
Support 'color 0x00ff00' for green skins. Cos we might as well.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4163 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-12-12 22:16:08 +00:00
parent a6e278ca21
commit d8fdaabfe4
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
engine/client/cl_main.c
View file

@ -1389,6 +1389,21 @@ void CL_Users_f (void)
Con_TPrintf (TLC_USERTOTAL, c); Con_TPrintf (TLC_USERTOTAL, c);
} }
int CL_ParseColour(char *colt)
{
int col;
if (!strncmp(colt, "0x", 2))
col = 0xff000000|strtoul(colt+2, NULL, 16);
else
{
col = atoi(colt);
col &= 15;
if (col > 13)
col = 13;
}
return col;
}
void CL_Color_f (void) void CL_Color_f (void)
{ {
// just for quake compatability... // just for quake compatability...
@ -1414,34 +1429,27 @@ void CL_Color_f (void)
if (Cmd_Argc() == 2) if (Cmd_Argc() == 2)
top = bottom = atoi(Cmd_Argv(1)); top = bottom = CL_ParseColour(Cmd_Argv(1));
else else
{ {
top = atoi(Cmd_Argv(1)); top = CL_ParseColour(Cmd_Argv(1));
bottom = atoi(Cmd_Argv(2)); bottom = CL_ParseColour(Cmd_Argv(2));
} }
top &= 15; Q_snprintfz (num, sizeof(num), (top&0xff000000)?"%#08x":"%i", top & 0xffffff);
if (top > 13)
top = 13;
bottom &= 15;
if (bottom > 13)
bottom = 13;
Q_snprintfz (num, sizeof(num), "%i", top);
if (top == 0) if (top == 0)
*num = '\0'; *num = '\0';
if (Cmd_ExecLevel>RESTRICT_SERVER) //colour command came from server for a split client if (Cmd_ExecLevel>RESTRICT_SERVER) //colour command came from server for a split client
Cbuf_AddText(va("cmd %i setinfo topcolor %i\n", Cmd_ExecLevel-RESTRICT_SERVER-1, top), Cmd_ExecLevel); Cbuf_AddText(va("cmd %i setinfo topcolor \"%s\"\n", Cmd_ExecLevel-RESTRICT_SERVER-1, num), Cmd_ExecLevel);
// else if (server_owns_colour) // else if (server_owns_colour)
// Cvar_LockFromServer(&topcolor, num); // Cvar_LockFromServer(&topcolor, num);
else else
Cvar_Set (&topcolor, num); Cvar_Set (&topcolor, num);
Q_snprintfz (num, sizeof(num), "%i", bottom); Q_snprintfz (num, sizeof(num), (bottom&0xff000000)?"%#08x":"%i", bottom & 0xffffff);
if (bottom == 0) if (bottom == 0)
*num = '\0'; *num = '\0';
if (Cmd_ExecLevel>RESTRICT_SERVER) //colour command came from server for a split client if (Cmd_ExecLevel>RESTRICT_SERVER) //colour command came from server for a split client
Cbuf_AddText(va("cmd %i setinfo bottomcolor %i\n", Cmd_ExecLevel-RESTRICT_SERVER-1, bottom), Cmd_ExecLevel); Cbuf_AddText(va("cmd %i setinfo bottomcolor \"%s\"\n", Cmd_ExecLevel-RESTRICT_SERVER-1, num), Cmd_ExecLevel);
else if (server_owns_colour) else if (server_owns_colour)
Cvar_LockFromServer(&bottomcolor, num); Cvar_LockFromServer(&bottomcolor, num);
else else
@ -3882,7 +3890,7 @@ void CL_ExecInitialConfigs(void)
com_parseutf8.ival = com_parseutf8.value; com_parseutf8.ival = com_parseutf8.value;
} }
// Cbuf_Execute (); //if the server initialisation causes a problem, give it a place to abort to Cbuf_Execute (); //if the server initialisation causes a problem, give it a place to abort to
//assuming they didn't use any waits in their config (fools) //assuming they didn't use any waits in their config (fools)
@ -3915,7 +3923,7 @@ void CL_ExecInitialConfigs(void)
if (COM_CheckParm ("-current")) if (COM_CheckParm ("-current"))
Cvar_Set(Cvar_FindVar("vid_desktopsettings"), "1"); Cvar_Set(Cvar_FindVar("vid_desktopsettings"), "1");
Cbuf_Execute (); //if the server initialisation causes a problem, give it a place to abort to // Cbuf_Execute (); //if the server initialisation causes a problem, give it a place to abort to
} }