So that client can now connect to dodgy servers that expect clc_move before sending a serverinfo. (sol.net)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@123 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
ec74d9ac80
commit
eefc867262
1 changed files with 12 additions and 4 deletions
|
@ -74,7 +74,7 @@ void KeyDown (kbutton_t *b)
|
||||||
int pnum;
|
int pnum;
|
||||||
c = Cmd_Argv(0);
|
c = Cmd_Argv(0);
|
||||||
pnum = atoi(c+strlen(c)-1);
|
pnum = atoi(c+strlen(c)-1);
|
||||||
if (c[1] == 'b' && !atoi(c+strlen(c)-2))
|
if (c[1] == 'b'&&c[2] == 'u' && !atoi(c+strlen(c)-2))
|
||||||
pnum = 0;
|
pnum = 0;
|
||||||
else if (pnum)pnum--;
|
else if (pnum)pnum--;
|
||||||
|
|
||||||
|
@ -110,7 +110,7 @@ void KeyUp (kbutton_t *b)
|
||||||
int pnum;
|
int pnum;
|
||||||
c = Cmd_Argv(0);
|
c = Cmd_Argv(0);
|
||||||
pnum = atoi(c+strlen(c)-1);
|
pnum = atoi(c+strlen(c)-1);
|
||||||
if (c[1] == 'b' && !atoi(c+strlen(c)-2))
|
if (c[1] == 'b'&&c[2] == 'u' && !atoi(c+strlen(c)-2))
|
||||||
pnum = 0;
|
pnum = 0;
|
||||||
else if (pnum)pnum--;
|
else if (pnum)pnum--;
|
||||||
|
|
||||||
|
@ -747,6 +747,8 @@ void CL_SendCmd (void)
|
||||||
int msecstouse;
|
int msecstouse;
|
||||||
qboolean dontdrop=false;
|
qboolean dontdrop=false;
|
||||||
|
|
||||||
|
int clientcount;
|
||||||
|
|
||||||
if (cls.demoplayback != DPB_NONE)
|
if (cls.demoplayback != DPB_NONE)
|
||||||
{
|
{
|
||||||
if (cls.demoplayback == DPB_MVD)
|
if (cls.demoplayback == DPB_MVD)
|
||||||
|
@ -852,7 +854,10 @@ void CL_SendCmd (void)
|
||||||
buf.maxsize = 128;
|
buf.maxsize = 128;
|
||||||
buf.cursize = 0;
|
buf.cursize = 0;
|
||||||
buf.data = data;
|
buf.data = data;
|
||||||
if (cl.splitclients) //wait for server data before sending clc_move stuff
|
clientcount = cl.splitclients;
|
||||||
|
if (!clientcount)
|
||||||
|
clientcount = 1;
|
||||||
|
if (1) //wait for server data before sending clc_move stuff
|
||||||
{
|
{
|
||||||
#ifdef Q2CLIENT
|
#ifdef Q2CLIENT
|
||||||
if (cls.q2server)
|
if (cls.q2server)
|
||||||
|
@ -899,7 +904,7 @@ void CL_SendCmd (void)
|
||||||
}
|
}
|
||||||
msecs -= msecstouse;
|
msecs -= msecstouse;
|
||||||
firstsize=0;
|
firstsize=0;
|
||||||
for (plnum = 0; plnum<cl.splitclients; plnum++)
|
for (plnum = 0; plnum<clientcount; plnum++)
|
||||||
{
|
{
|
||||||
i = cls.netchan.outgoing_sequence & UPDATE_MASK;
|
i = cls.netchan.outgoing_sequence & UPDATE_MASK;
|
||||||
cmd = &cl.frames[i].cmd[plnum];
|
cmd = &cl.frames[i].cmd[plnum];
|
||||||
|
@ -953,6 +958,9 @@ void CL_SendCmd (void)
|
||||||
|
|
||||||
memset(accum[plnum], 0, sizeof(accum[plnum])); //clear accum
|
memset(accum[plnum], 0, sizeof(accum[plnum])); //clear accum
|
||||||
|
|
||||||
|
if (plnum)
|
||||||
|
MSG_WriteByte (&buf, clc_move);
|
||||||
|
|
||||||
i = (cls.netchan.outgoing_sequence-2) & UPDATE_MASK;
|
i = (cls.netchan.outgoing_sequence-2) & UPDATE_MASK;
|
||||||
cmd = &cl.frames[i].cmd[plnum];
|
cmd = &cl.frames[i].cmd[plnum];
|
||||||
cmd->lightlevel = lightlev;
|
cmd->lightlevel = lightlev;
|
||||||
|
|
Loading…
Reference in a new issue