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

------------------------------------------------------------------------ 

r4245 | acceptthis | 2013-03-08 02:48:56 +0000 (Fri, 08 Mar 2013) | 2 lines

rename cl_forcesplitclient to in_forcesplitclient. I can probably find it more easily then.
binds for eg give are now sent to the server in the context of the correct split-client.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4241 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2013-03-12 23:18:12 +00:00
parent 57da8fe041
commit 60bc6a91db
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/client/cl_input.c
View File

@ -49,7 +49,7 @@ vec3_t mousemovements[MAX_SPLITS];
/*kinda a hack...*/
static int con_splitmodifier;
cvar_t cl_forcesplitclient = CVAR("cl_forcesplitclient", "0");
cvar_t cl_forcesplitclient = CVAR("in_forcesplitclient", "0");
extern cvar_t cl_splitscreen;
int CL_TargettedSplit(qboolean nowrap)
{

18
engine/common/cmd.c
View File

@ -1823,6 +1823,7 @@ so when they are typed in at the console, they will need to be forwarded.
*/
void Cmd_ForwardToServer (void)
{
int sp;
if (cls.state == ca_disconnected)
{
if (cl_warncmd.ival)
@ -1841,10 +1842,21 @@ void Cmd_ForwardToServer (void)
}
#endif
if (Cmd_Argc() > 1)
CL_SendClientCommand(true, "%s %s", Cmd_Argv(0), Cmd_Args());
sp = CL_TargettedSplit(false);
if (sp)
{
if (Cmd_Argc() > 1)
CL_SendClientCommand(true, "%i %s %s", sp+1, Cmd_Argv(0), Cmd_Args());
else
CL_SendClientCommand(true, "%i %s", sp+1, Cmd_Argv(0));
}
else
CL_SendClientCommand(true, "%s", Cmd_Argv(0));
{
if (Cmd_Argc() > 1)
CL_SendClientCommand(true, "%s %s", Cmd_Argv(0), Cmd_Args());
else
CL_SendClientCommand(true, "%s", Cmd_Argv(0));
}
}
// don't forward the first argument