2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
Copyright (C) 1996-1997 Id Software, Inc.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU General Public License
|
|
|
|
as published by the Free Software Foundation; either version 2
|
|
|
|
of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
|
|
|
|
See the GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
*/
|
|
|
|
// cl.input.c -- builds an intended movement command to send to the server
|
|
|
|
|
|
|
|
#include "quakedef.h"
|
|
|
|
|
2005-02-28 07:16:19 +00:00
|
|
|
#ifdef _WIN32
|
|
|
|
#include "winquake.h" //fps indep stuff.
|
|
|
|
#endif
|
|
|
|
|
2005-03-10 03:55:18 +00:00
|
|
|
float in_sensitivityscale = 1;
|
2005-02-28 07:16:19 +00:00
|
|
|
|
2008-06-12 20:47:13 +00:00
|
|
|
void CL_SpareMsec_Callback (struct cvar_s *var, char *oldvalue);
|
|
|
|
|
2010-07-11 02:22:39 +00:00
|
|
|
cvar_t cl_nodelta = CVAR("cl_nodelta","0");
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2010-07-11 02:22:39 +00:00
|
|
|
cvar_t cl_c2spps = CVAR("cl_c2spps", "0");
|
2006-02-11 02:09:43 +00:00
|
|
|
cvar_t cl_c2sImpulseBackup = SCVAR("cl_c2sImpulseBackup","3");
|
2010-07-11 02:22:39 +00:00
|
|
|
cvar_t cl_netfps = CVAR("cl_netfps", "0");
|
|
|
|
cvar_t cl_sparemsec = CVARC("cl_sparemsec", "10", CL_SpareMsec_Callback);
|
|
|
|
cvar_t cl_queueimpulses = CVAR("cl_queueimpulses", "0");
|
|
|
|
cvar_t cl_smartjump = CVAR("cl_smartjump", "1");
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2010-07-11 02:22:39 +00:00
|
|
|
cvar_t cl_prydoncursor = CVAR("cl_prydoncursor", ""); //for dp protocol
|
|
|
|
cvar_t cl_instantrotate = CVARF("cl_instantrotate", "1", CVAR_SEMICHEAT);
|
2005-08-03 23:14:59 +00:00
|
|
|
|
2010-07-11 02:22:39 +00:00
|
|
|
cvar_t prox_inmenu = CVAR("prox_inmenu", "0");
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-05-26 12:55:34 +00:00
|
|
|
usercmd_t independantphysics[MAX_SPLITS];
|
2009-05-24 10:11:17 +00:00
|
|
|
vec3_t mousemovements[MAX_SPLITS];
|
2005-05-26 12:55:34 +00:00
|
|
|
|
2010-08-14 00:15:07 +00:00
|
|
|
/*kinda a hack...*/
|
|
|
|
int con_splitmodifier;
|
|
|
|
cvar_t cl_defaultsplitclient = CVAR("cl_defaultsplitclient", "0");
|
|
|
|
int CL_TargettedSplit(void)
|
|
|
|
{
|
|
|
|
char *c;
|
|
|
|
int pnum;
|
|
|
|
if (!cl.splitclients)
|
|
|
|
return 0;
|
|
|
|
c = Cmd_Argv(0);
|
|
|
|
pnum = atoi(c+strlen(c)-1);
|
|
|
|
if (pnum && !(c[1] == 'b'&&c[2] == 'u' && !atoi(c+strlen(c)-2)))
|
|
|
|
{
|
|
|
|
pnum--;
|
|
|
|
return pnum;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (con_splitmodifier > 0)
|
|
|
|
return (con_splitmodifier - 1)% cl.splitclients;
|
|
|
|
else if (cl_defaultsplitclient.ival > 0)
|
|
|
|
return cl_defaultsplitclient.ival % cl.splitclients;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void CL_Split_f(void)
|
|
|
|
{
|
|
|
|
int tmp;
|
|
|
|
char *c;
|
|
|
|
c = Cmd_Argv(0);
|
|
|
|
tmp = con_splitmodifier;
|
|
|
|
if (*c == '+' || *c == '-')
|
|
|
|
{
|
|
|
|
con_splitmodifier = c[2];
|
|
|
|
Cmd_ExecuteString(va("%c%s", *c, Cmd_Args()), Cmd_ExecLevel);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
con_splitmodifier = c[1];
|
|
|
|
Cmd_ExecuteString(Cmd_Args(), Cmd_ExecLevel);
|
|
|
|
}
|
|
|
|
con_splitmodifier = tmp;
|
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
===============================================================================
|
|
|
|
|
|
|
|
KEY BUTTONS
|
|
|
|
|
|
|
|
Continuous button event tracking is complicated by the fact that two different
|
|
|
|
input sources (say, mouse button 1 and the control key) can both press the
|
|
|
|
same button, but the button should only be released when both of the
|
|
|
|
pressing key have been released.
|
|
|
|
|
|
|
|
When a key event issues a button command (+forward, +attack, etc), it appends
|
|
|
|
its key number as a parameter to the command so it can be matched up with
|
|
|
|
the release.
|
|
|
|
|
|
|
|
state bit 0 is the current state of the key
|
|
|
|
state bit 1 is edge triggered on the up to down transition
|
|
|
|
state bit 2 is edge triggered on the down to up transition
|
|
|
|
|
|
|
|
===============================================================================
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
kbutton_t in_mlook, in_klook;
|
|
|
|
kbutton_t in_left, in_right, in_forward, in_back;
|
|
|
|
kbutton_t in_lookup, in_lookdown, in_moveleft, in_moveright;
|
|
|
|
kbutton_t in_strafe, in_speed, in_use, in_jump, in_attack;
|
|
|
|
kbutton_t in_up, in_down;
|
|
|
|
|
2004-09-01 22:56:08 +00:00
|
|
|
kbutton_t in_button3, in_button4, in_button5, in_button6, in_button7, in_button8;
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
#define IN_IMPULSECACHE 256
|
|
|
|
int in_impulse[MAX_SPLITS][IN_IMPULSECACHE];
|
|
|
|
int in_nextimpulse[MAX_SPLITS];
|
|
|
|
int in_impulsespending[MAX_SPLITS];
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
float cursor_screen[2];
|
|
|
|
qboolean cursor_active;
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2010-08-14 00:15:07 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
void KeyDown (kbutton_t *b)
|
|
|
|
{
|
|
|
|
int k;
|
|
|
|
char *c;
|
|
|
|
|
2010-08-14 00:15:07 +00:00
|
|
|
int pnum = CL_TargettedSplit();
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
c = Cmd_Argv(1);
|
|
|
|
if (c[0])
|
|
|
|
k = atoi(c)&255;
|
|
|
|
else
|
|
|
|
k = -1; // typed manually at the console for continuous down
|
|
|
|
|
|
|
|
if (k == b->down[pnum][0] || k == b->down[pnum][1])
|
|
|
|
return; // repeating key
|
|
|
|
|
|
|
|
if (!b->down[pnum][0])
|
|
|
|
b->down[pnum][0] = k;
|
|
|
|
else if (!b->down[pnum][1])
|
|
|
|
b->down[pnum][1] = k;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Con_Printf ("Three keys down for a button!\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (b->state[pnum] & 1)
|
|
|
|
return; // still down
|
|
|
|
b->state[pnum] |= 1 + 2; // down + impulse down
|
|
|
|
}
|
|
|
|
|
|
|
|
void KeyUp (kbutton_t *b)
|
|
|
|
{
|
|
|
|
int k;
|
|
|
|
char *c;
|
|
|
|
|
2010-08-14 00:15:07 +00:00
|
|
|
int pnum = CL_TargettedSplit();
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
c = Cmd_Argv(1);
|
|
|
|
if (c[0])
|
|
|
|
k = atoi(c)&255;
|
|
|
|
else
|
|
|
|
{ // typed manually at the console, assume for unsticking, so clear all
|
|
|
|
b->down[pnum][0] = b->down[pnum][1] = 0;
|
|
|
|
b->state[pnum] = 4; // impulse up
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (b->down[pnum][0] == k)
|
|
|
|
b->down[pnum][0] = 0;
|
|
|
|
else if (b->down[pnum][1] == k)
|
|
|
|
b->down[pnum][1] = 0;
|
|
|
|
else
|
|
|
|
return; // key up without coresponding down (menu pass through)
|
|
|
|
if (b->down[pnum][0] || b->down[pnum][1])
|
|
|
|
return; // some other key is still holding it down
|
|
|
|
|
|
|
|
if (!(b->state[pnum] & 1))
|
|
|
|
return; // still up (this should not happen)
|
|
|
|
b->state[pnum] &= ~1; // now up
|
|
|
|
b->state[pnum] |= 4; // impulse up
|
|
|
|
}
|
|
|
|
|
|
|
|
void IN_KLookDown (void) {KeyDown(&in_klook);}
|
|
|
|
void IN_KLookUp (void) {KeyUp(&in_klook);}
|
|
|
|
void IN_MLookDown (void) {KeyDown(&in_mlook);}
|
2010-08-14 00:15:07 +00:00
|
|
|
void IN_MLookUp (void)
|
|
|
|
{
|
|
|
|
int pnum = CL_TargettedSplit();
|
|
|
|
KeyUp(&in_mlook);
|
|
|
|
if ( !(in_mlook.state[pnum]&1) && lookspring.ival)
|
|
|
|
V_StartPitchDrift(pnum);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
void IN_UpDown(void) {KeyDown(&in_up);}
|
|
|
|
void IN_UpUp(void) {KeyUp(&in_up);}
|
|
|
|
void IN_DownDown(void) {KeyDown(&in_down);}
|
|
|
|
void IN_DownUp(void) {KeyUp(&in_down);}
|
|
|
|
void IN_LeftDown(void) {KeyDown(&in_left);}
|
|
|
|
void IN_LeftUp(void) {KeyUp(&in_left);}
|
|
|
|
void IN_RightDown(void) {KeyDown(&in_right);}
|
|
|
|
void IN_RightUp(void) {KeyUp(&in_right);}
|
|
|
|
void IN_ForwardDown(void) {KeyDown(&in_forward);}
|
|
|
|
void IN_ForwardUp(void) {KeyUp(&in_forward);}
|
|
|
|
void IN_BackDown(void) {KeyDown(&in_back);}
|
|
|
|
void IN_BackUp(void) {KeyUp(&in_back);}
|
|
|
|
void IN_LookupDown(void) {KeyDown(&in_lookup);}
|
|
|
|
void IN_LookupUp(void) {KeyUp(&in_lookup);}
|
|
|
|
void IN_LookdownDown(void) {KeyDown(&in_lookdown);}
|
|
|
|
void IN_LookdownUp(void) {KeyUp(&in_lookdown);}
|
|
|
|
void IN_MoveleftDown(void) {KeyDown(&in_moveleft);}
|
|
|
|
void IN_MoveleftUp(void) {KeyUp(&in_moveleft);}
|
|
|
|
void IN_MoverightDown(void) {KeyDown(&in_moveright);}
|
|
|
|
void IN_MoverightUp(void) {KeyUp(&in_moveright);}
|
|
|
|
|
|
|
|
void IN_SpeedDown(void) {KeyDown(&in_speed);}
|
|
|
|
void IN_SpeedUp(void) {KeyUp(&in_speed);}
|
|
|
|
void IN_StrafeDown(void) {KeyDown(&in_strafe);}
|
|
|
|
void IN_StrafeUp(void) {KeyUp(&in_strafe);}
|
|
|
|
|
|
|
|
void IN_AttackDown(void) {KeyDown(&in_attack);}
|
|
|
|
void IN_AttackUp(void) {KeyUp(&in_attack);}
|
|
|
|
|
|
|
|
void IN_UseDown (void) {KeyDown(&in_use);}
|
|
|
|
void IN_UseUp (void) {KeyUp(&in_use);}
|
2005-04-16 16:21:27 +00:00
|
|
|
void IN_JumpDown (void)
|
|
|
|
{
|
|
|
|
qboolean condition;
|
|
|
|
|
|
|
|
|
2010-08-14 00:15:07 +00:00
|
|
|
int pnum = CL_TargettedSplit();
|
2005-04-16 16:21:27 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
condition = (cls.state == ca_active && cl_smartjump.ival && !prox_inmenu.ival);
|
2005-04-16 16:21:27 +00:00
|
|
|
#ifdef Q2CLIENT
|
2005-05-26 12:55:34 +00:00
|
|
|
if (condition && cls.protocol == CP_QUAKE2)
|
2005-04-16 16:21:27 +00:00
|
|
|
KeyDown(&in_up);
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
if (condition && cl.stats[pnum][STAT_HEALTH] > 0 && !cls.demoplayback && !cl.spectator &&
|
2005-09-28 23:40:33 +00:00
|
|
|
cl.frames[cl.validsequence&UPDATE_MASK].playerstate[cl.playernum[pnum]].messagenum == cl.validsequence && cl.waterlevel[pnum] >= 2 && (!cl.teamfortress || !(in_forward.state[pnum] & 1))
|
2005-04-16 16:21:27 +00:00
|
|
|
)
|
|
|
|
KeyDown(&in_up);
|
|
|
|
else if (condition && cl.spectator && Cam_TrackNum(pnum) == -1)
|
|
|
|
KeyDown(&in_up);
|
|
|
|
else
|
|
|
|
KeyDown(&in_jump);
|
|
|
|
}
|
|
|
|
void IN_JumpUp (void)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
if (cl_smartjump.ival)
|
2005-04-16 16:21:27 +00:00
|
|
|
KeyUp(&in_up);
|
|
|
|
KeyUp(&in_jump);
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
|
2004-09-01 22:56:08 +00:00
|
|
|
void IN_Button3Down(void) {KeyDown(&in_button3);}
|
|
|
|
void IN_Button3Up(void) {KeyUp(&in_button3);}
|
|
|
|
void IN_Button4Down(void) {KeyDown(&in_button4);}
|
|
|
|
void IN_Button4Up(void) {KeyUp(&in_button4);}
|
|
|
|
void IN_Button5Down(void) {KeyDown(&in_button5);}
|
|
|
|
void IN_Button5Up(void) {KeyUp(&in_button5);}
|
|
|
|
void IN_Button6Down(void) {KeyDown(&in_button6);}
|
|
|
|
void IN_Button6Up(void) {KeyUp(&in_button6);}
|
|
|
|
void IN_Button7Down(void) {KeyDown(&in_button7);}
|
|
|
|
void IN_Button7Up(void) {KeyUp(&in_button7);}
|
|
|
|
void IN_Button8Down(void) {KeyDown(&in_button8);}
|
|
|
|
void IN_Button8Up(void) {KeyUp(&in_button8);}
|
|
|
|
|
2005-01-13 16:29:20 +00:00
|
|
|
float in_rotate;
|
|
|
|
void IN_Rotate_f (void) {in_rotate += atoi(Cmd_Argv(1));}
|
|
|
|
|
2004-09-01 22:56:08 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
//is this useful?
|
|
|
|
|
|
|
|
//This function incorporates Tonik's impulse 8 7 6 5 4 3 2 1 to select the prefered weapon on the basis of having it.
|
|
|
|
//It also incorporates split screen input as well as impulse buffering
|
|
|
|
void IN_Impulse (void)
|
|
|
|
{
|
|
|
|
int newimp;
|
|
|
|
int best, i, imp, items;
|
|
|
|
|
|
|
|
|
2005-03-01 15:36:23 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
char *c;
|
|
|
|
int pnum;
|
|
|
|
c = Cmd_Argv(0);
|
|
|
|
pnum = atoi(c+strlen(c)-1);
|
|
|
|
if (pnum)pnum--;
|
|
|
|
|
|
|
|
newimp = Q_atoi(Cmd_Argv(1));
|
|
|
|
|
|
|
|
if (Cmd_Argc() > 2)
|
|
|
|
{
|
|
|
|
items = cl.stats[pnum][STAT_ITEMS];
|
|
|
|
best = 0;
|
|
|
|
|
|
|
|
for (i = Cmd_Argc() - 1; i > 0; i--)
|
|
|
|
{
|
|
|
|
imp = Q_atoi(Cmd_Argv(i));
|
|
|
|
if (imp < 1 || imp > 8)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
switch (imp)
|
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
if (items & IT_AXE)
|
|
|
|
best = 1;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
if (items & IT_SHOTGUN && cl.stats[pnum][STAT_SHELLS] >= 1)
|
|
|
|
best = 2;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
if (items & IT_SUPER_SHOTGUN && cl.stats[pnum][STAT_SHELLS] >= 2)
|
|
|
|
best = 3;
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
if (items & IT_NAILGUN && cl.stats[pnum][STAT_NAILS] >= 1)
|
|
|
|
best = 4;
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
if (items & IT_SUPER_NAILGUN && cl.stats[pnum][STAT_NAILS] >= 2)
|
|
|
|
best = 5;
|
|
|
|
break;
|
|
|
|
case 6:
|
|
|
|
if (items & IT_GRENADE_LAUNCHER && cl.stats[pnum][STAT_ROCKETS] >= 1)
|
|
|
|
best = 6;
|
|
|
|
break;
|
|
|
|
case 7:
|
|
|
|
if (items & IT_ROCKET_LAUNCHER && cl.stats[pnum][STAT_ROCKETS] >= 1)
|
|
|
|
best = 7;
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
if (items & IT_LIGHTNING && cl.stats[pnum][STAT_CELLS] >= 1)
|
|
|
|
best = 8;
|
|
|
|
}
|
|
|
|
}
|
2005-03-01 15:36:23 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
if (best)
|
|
|
|
newimp = best;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (in_impulsespending[pnum]>=IN_IMPULSECACHE)
|
|
|
|
{
|
|
|
|
Con_Printf("Too many impulses, ignoring %i\n", newimp);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (cl_queueimpulses.ival)
|
2008-01-22 17:00:05 +00:00
|
|
|
{
|
|
|
|
in_impulse[pnum][(in_nextimpulse[pnum]+in_impulsespending[pnum])%IN_IMPULSECACHE] = newimp;
|
|
|
|
in_impulsespending[pnum]++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
in_impulse[pnum][(in_nextimpulse[pnum])%IN_IMPULSECACHE] = newimp;
|
|
|
|
in_impulsespending[pnum]=1;
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2006-02-21 09:19:56 +00:00
|
|
|
void IN_Restart (void)
|
2006-02-20 22:33:30 +00:00
|
|
|
{
|
|
|
|
IN_Shutdown();
|
2006-05-10 22:12:20 +00:00
|
|
|
IN_ReInit();
|
2006-02-20 22:33:30 +00:00
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
===============
|
|
|
|
CL_KeyState
|
|
|
|
|
|
|
|
Returns 0.25 if a key was pressed and released during the frame,
|
|
|
|
0.5 if it was pressed and held
|
|
|
|
0 if held then released, and
|
|
|
|
1.0 if held for the entire time
|
|
|
|
===============
|
|
|
|
*/
|
|
|
|
float CL_KeyState (kbutton_t *key, int pnum)
|
|
|
|
{
|
|
|
|
float val;
|
|
|
|
qboolean impulsedown, impulseup, down;
|
|
|
|
|
|
|
|
impulsedown = key->state[pnum] & 2;
|
|
|
|
impulseup = key->state[pnum] & 4;
|
|
|
|
down = key->state[pnum] & 1;
|
|
|
|
val = 0;
|
|
|
|
|
|
|
|
if (impulsedown && !impulseup)
|
|
|
|
{
|
|
|
|
if (down)
|
|
|
|
val = 0.5; // pressed and held this frame
|
|
|
|
else
|
|
|
|
val = 0; // I_Error ();
|
|
|
|
}
|
|
|
|
if (impulseup && !impulsedown)
|
|
|
|
{
|
|
|
|
if (down)
|
|
|
|
val = 0; // I_Error ();
|
|
|
|
else
|
|
|
|
val = 0; // released this frame
|
|
|
|
}
|
|
|
|
if (!impulsedown && !impulseup)
|
|
|
|
{
|
|
|
|
if (down)
|
|
|
|
val = 1.0; // held the entire frame
|
|
|
|
else
|
|
|
|
val = 0; // up the entire frame
|
|
|
|
}
|
|
|
|
if (impulsedown && impulseup)
|
|
|
|
{
|
|
|
|
if (down)
|
|
|
|
val = 0.75; // released and re-pressed this frame
|
|
|
|
else
|
|
|
|
val = 0.25; // pressed and released this frame
|
|
|
|
}
|
|
|
|
|
|
|
|
key->state[pnum] &= 1; // clear impulses
|
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2007-01-06 09:37:33 +00:00
|
|
|
void CL_ProxyMenuHook(char *command, kbutton_t *key)
|
|
|
|
{
|
|
|
|
if ((key->state[0] & 3) == 3) //2 is impulse down, 1 is held down
|
|
|
|
{
|
|
|
|
key->state[0] = 0; // clear impulses
|
|
|
|
|
|
|
|
Cbuf_AddText(command, RESTRICT_DEFAULT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void CL_ProxyMenuHooks(void)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
if (!prox_inmenu.ival)
|
2007-01-06 09:37:33 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
CL_ProxyMenuHook("say proxy:menu down\n", &in_back);
|
|
|
|
CL_ProxyMenuHook("say proxy:menu up\n", &in_forward);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2007-01-06 09:37:33 +00:00
|
|
|
CL_ProxyMenuHook("say proxy:menu left\n", &in_left);
|
|
|
|
CL_ProxyMenuHook("say proxy:menu right\n", &in_right);
|
|
|
|
|
|
|
|
CL_ProxyMenuHook("say proxy:menu left\n", &in_moveleft);
|
|
|
|
CL_ProxyMenuHook("say proxy:menu right\n", &in_moveright);
|
|
|
|
|
|
|
|
CL_ProxyMenuHook("say proxy:menu use\n", &in_jump);
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
|
2008-01-15 19:24:28 +00:00
|
|
|
cvar_t cl_upspeed = SCVARF("cl_upspeed","400", CVAR_ARCHIVE);
|
2006-02-11 02:09:43 +00:00
|
|
|
cvar_t cl_forwardspeed = SCVARF("cl_forwardspeed","400", CVAR_ARCHIVE);
|
|
|
|
cvar_t cl_backspeed = SCVARF("cl_backspeed","400", CVAR_ARCHIVE);
|
2008-01-15 19:24:28 +00:00
|
|
|
cvar_t cl_sidespeed = SCVARF("cl_sidespeed","400", CVAR_ARCHIVE);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2006-02-11 02:09:43 +00:00
|
|
|
cvar_t cl_movespeedkey = SCVAR("cl_movespeedkey","2.0");
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2006-02-11 02:09:43 +00:00
|
|
|
cvar_t cl_yawspeed = SCVAR("cl_yawspeed","140");
|
|
|
|
cvar_t cl_pitchspeed = SCVAR("cl_pitchspeed","150");
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2006-02-11 02:09:43 +00:00
|
|
|
cvar_t cl_anglespeedkey = SCVAR("cl_anglespeedkey","1.5");
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
================
|
|
|
|
CL_AdjustAngles
|
|
|
|
|
|
|
|
Moves the local angle positions
|
|
|
|
================
|
|
|
|
*/
|
2009-05-24 10:11:17 +00:00
|
|
|
void CL_AdjustAngles (int pnum, double frametime)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-01-13 16:29:20 +00:00
|
|
|
float speed, quant;
|
2004-08-23 00:15:46 +00:00
|
|
|
float up, down;
|
|
|
|
|
|
|
|
if (in_speed.state[pnum] & 1)
|
2007-08-23 21:25:18 +00:00
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
if (ruleset_allow_frj.ival)
|
|
|
|
speed = frametime * cl_anglespeedkey.ival;
|
2007-08-23 21:25:18 +00:00
|
|
|
else
|
2009-11-04 21:16:50 +00:00
|
|
|
speed = frametime * bound(-2, cl_anglespeedkey.ival, 2);
|
2007-08-23 21:25:18 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
else
|
2009-05-24 10:11:17 +00:00
|
|
|
speed = frametime;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2006-07-17 17:33:35 +00:00
|
|
|
if (in_rotate && pnum==0 && !(cl.fpd & FPD_LIMIT_YAW))
|
2005-01-13 16:29:20 +00:00
|
|
|
{
|
|
|
|
quant = in_rotate;
|
2009-11-04 21:16:50 +00:00
|
|
|
if (!cl_instantrotate.ival)
|
2005-08-11 04:14:33 +00:00
|
|
|
quant *= speed;
|
2005-01-13 16:29:20 +00:00
|
|
|
in_rotate -= quant;
|
2009-11-04 21:16:50 +00:00
|
|
|
if (ruleset_allow_frj.ival)
|
2007-08-23 21:25:18 +00:00
|
|
|
cl.viewangles[pnum][YAW] += quant;
|
2005-01-13 16:29:20 +00:00
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
if (!(in_strafe.state[pnum] & 1))
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
quant = cl_yawspeed.ival;
|
|
|
|
if (cl.fpd & FPD_LIMIT_YAW || !ruleset_allow_frj.ival)
|
2006-07-17 17:33:35 +00:00
|
|
|
quant = bound(-900, quant, 900);
|
|
|
|
cl.viewangles[pnum][YAW] -= speed*quant * CL_KeyState (&in_right, pnum);
|
|
|
|
cl.viewangles[pnum][YAW] += speed*quant * CL_KeyState (&in_left, pnum);
|
2004-08-23 00:15:46 +00:00
|
|
|
cl.viewangles[pnum][YAW] = anglemod(cl.viewangles[pnum][YAW]);
|
|
|
|
}
|
|
|
|
if (in_klook.state[pnum] & 1)
|
|
|
|
{
|
|
|
|
V_StopPitchDrift (pnum);
|
2009-11-04 21:16:50 +00:00
|
|
|
quant = cl_pitchspeed.ival;
|
|
|
|
if (cl.fpd & FPD_LIMIT_PITCH || !ruleset_allow_frj.ival)
|
2006-07-17 17:33:35 +00:00
|
|
|
quant = bound(-700, quant, 700);
|
|
|
|
cl.viewangles[pnum][PITCH] -= speed*quant * CL_KeyState (&in_forward, pnum);
|
|
|
|
cl.viewangles[pnum][PITCH] += speed*quant * CL_KeyState (&in_back, pnum);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
up = CL_KeyState (&in_lookup, pnum);
|
|
|
|
down = CL_KeyState(&in_lookdown, pnum);
|
2007-08-23 21:25:18 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
quant = cl_pitchspeed.ival;
|
|
|
|
if (!ruleset_allow_frj.ival)
|
2007-08-23 21:25:18 +00:00
|
|
|
quant = bound(-700, quant, 700);
|
2009-11-04 21:16:50 +00:00
|
|
|
cl.viewangles[pnum][PITCH] -= speed*cl_pitchspeed.ival * up;
|
|
|
|
cl.viewangles[pnum][PITCH] += speed*cl_pitchspeed.ival * down;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (up || down)
|
|
|
|
V_StopPitchDrift (pnum);
|
|
|
|
|
|
|
|
CL_ClampPitch(pnum);
|
|
|
|
|
|
|
|
if (cl.viewangles[pnum][ROLL] > 50)
|
|
|
|
cl.viewangles[pnum][ROLL] = 50;
|
|
|
|
if (cl.viewangles[pnum][ROLL] < -50)
|
|
|
|
cl.viewangles[pnum][ROLL] = -50;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
================
|
|
|
|
CL_BaseMove
|
|
|
|
|
|
|
|
Send the intended movement message to the server
|
|
|
|
================
|
|
|
|
*/
|
2005-05-26 12:55:34 +00:00
|
|
|
void CL_BaseMove (usercmd_t *cmd, int pnum, float extra, float wantfps)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-05-26 12:55:34 +00:00
|
|
|
float scale = 1;//extra/1000.0f * 1/wantfps;
|
|
|
|
|
|
|
|
//
|
|
|
|
// adjust for speed key
|
|
|
|
//
|
|
|
|
if (in_speed.state[pnum] & 1)
|
|
|
|
scale *= cl_movespeedkey.value;
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
if (in_strafe.state[pnum] & 1)
|
|
|
|
{
|
2005-05-26 12:55:34 +00:00
|
|
|
cmd->sidemove += scale*cl_sidespeed.value * CL_KeyState (&in_right, pnum);
|
|
|
|
cmd->sidemove -= scale*cl_sidespeed.value * CL_KeyState (&in_left, pnum);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2005-05-26 12:55:34 +00:00
|
|
|
cmd->sidemove += scale*cl_sidespeed.value * CL_KeyState (&in_moveright, pnum);
|
|
|
|
cmd->sidemove -= scale*cl_sidespeed.value * CL_KeyState (&in_moveleft, pnum);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
#ifdef IN_XFLIP
|
2009-11-04 21:16:50 +00:00
|
|
|
if(in_xflip.ival) cmd->sidemove *= -1;
|
2004-08-23 00:15:46 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2005-05-26 12:55:34 +00:00
|
|
|
cmd->upmove += scale*cl_upspeed.value * CL_KeyState (&in_up, pnum);
|
|
|
|
cmd->upmove -= scale*cl_upspeed.value * CL_KeyState (&in_down, pnum);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (! (in_klook.state[pnum] & 1) )
|
|
|
|
{
|
2005-05-26 12:55:34 +00:00
|
|
|
cmd->forwardmove += scale*cl_forwardspeed.value * CL_KeyState (&in_forward, pnum);
|
|
|
|
cmd->forwardmove -= scale*cl_backspeed.value * CL_KeyState (&in_back, pnum);
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int MakeChar (int i)
|
|
|
|
{
|
|
|
|
if (i < -127*4)
|
|
|
|
i = -127*4;
|
|
|
|
if (i > 127*4)
|
|
|
|
i = 127*4;
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
void CL_ClampPitch (int pnum)
|
|
|
|
{
|
|
|
|
#ifdef Q2CLIENT
|
|
|
|
float pitch;
|
2005-05-26 12:55:34 +00:00
|
|
|
if (cls.protocol == CP_QUAKE2)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
pitch = SHORT2ANGLE(cl.q2frame.playerstate.pmove.delta_angles[PITCH]);
|
|
|
|
if (pitch > 180)
|
|
|
|
pitch -= 360;
|
|
|
|
|
|
|
|
if (cl.viewangles[pnum][PITCH] + pitch < -360)
|
|
|
|
cl.viewangles[pnum][PITCH] += 360; // wrapped
|
|
|
|
if (cl.viewangles[pnum][PITCH] + pitch > 360)
|
|
|
|
cl.viewangles[pnum][PITCH] -= 360; // wrapped
|
|
|
|
|
|
|
|
if (cl.viewangles[pnum][PITCH] + pitch > cl.maxpitch)
|
|
|
|
cl.viewangles[pnum][PITCH] = cl.maxpitch - pitch;
|
|
|
|
if (cl.viewangles[pnum][PITCH] + pitch < cl.minpitch)
|
|
|
|
cl.viewangles[pnum][PITCH] = cl.minpitch - pitch;
|
|
|
|
}
|
|
|
|
else
|
2009-05-31 11:46:57 +00:00
|
|
|
#endif
|
|
|
|
#ifdef Q3CLIENT
|
2009-11-04 21:16:50 +00:00
|
|
|
if (cls.protocol == CP_QUAKE3) //q3 expects the cgame to do it
|
2009-05-31 11:46:57 +00:00
|
|
|
{
|
|
|
|
//no-op
|
|
|
|
}
|
|
|
|
else
|
2004-08-23 00:15:46 +00:00
|
|
|
#endif
|
|
|
|
{
|
|
|
|
if (cl.viewangles[pnum][PITCH] > cl.maxpitch)
|
|
|
|
cl.viewangles[pnum][PITCH] = cl.maxpitch;
|
|
|
|
if (cl.viewangles[pnum][PITCH] < cl.minpitch)
|
|
|
|
cl.viewangles[pnum][PITCH] = cl.minpitch;
|
2009-11-04 21:16:50 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
==============
|
|
|
|
CL_FinishMove
|
|
|
|
==============
|
|
|
|
*/
|
|
|
|
void CL_FinishMove (usercmd_t *cmd, int msecs, int pnum)
|
|
|
|
{
|
2005-06-14 04:52:10 +00:00
|
|
|
int i;
|
2004-09-01 22:56:08 +00:00
|
|
|
int bits;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
//
|
2005-07-28 15:33:27 +00:00
|
|
|
// always dump the first two message, because it may contain leftover inputs
|
2004-08-23 00:15:46 +00:00
|
|
|
// from the last level
|
|
|
|
//
|
|
|
|
if (++cl.movemessages <= 2)
|
2005-08-03 23:14:59 +00:00
|
|
|
{
|
|
|
|
cmd->buttons = 0;
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
2005-08-03 23:14:59 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
//
|
|
|
|
// figure button bits
|
|
|
|
//
|
2004-09-01 22:56:08 +00:00
|
|
|
|
|
|
|
bits = 0;
|
|
|
|
if (in_attack .state[pnum] & 3) bits |= 1; in_attack.state[pnum] &= ~2;
|
|
|
|
if (in_jump .state[pnum] & 3) bits |= 2; in_jump.state[pnum] &= ~2;
|
|
|
|
if (in_use .state[pnum] & 3) bits |= 4; in_use.state[pnum] &= ~2;
|
|
|
|
if (in_button3.state[pnum] & 3) bits |= 4; in_button3.state[pnum] &= ~2; //yup, flag 4 twice.
|
|
|
|
if (in_button4.state[pnum] & 3) bits |= 8; in_button4.state[pnum] &= ~2;
|
|
|
|
if (in_button5.state[pnum] & 3) bits |= 16; in_button5.state[pnum] &= ~2;
|
|
|
|
if (in_button6.state[pnum] & 3) bits |= 32; in_button6.state[pnum] &= ~2;
|
|
|
|
if (in_button7.state[pnum] & 3) bits |= 64; in_button7.state[pnum] &= ~2;
|
|
|
|
if (in_button8.state[pnum] & 3) bits |= 128; in_button8.state[pnum] &= ~2;
|
|
|
|
cmd->buttons = bits;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// send milliseconds of time to apply the move
|
2005-05-26 12:55:34 +00:00
|
|
|
cmd->msec = msecs;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
for (i=0 ; i<3 ; i++)
|
|
|
|
cmd->angles[i] = ((int)(cl.viewangles[pnum][i]*65536.0/360)&65535);
|
|
|
|
|
|
|
|
if (in_impulsespending[pnum])
|
|
|
|
{
|
|
|
|
in_nextimpulse[pnum]++;
|
|
|
|
in_impulsespending[pnum]--;
|
|
|
|
cmd->impulse = in_impulse[pnum][(in_nextimpulse[pnum]-1)%IN_IMPULSECACHE];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
cmd->impulse = 0;
|
|
|
|
}
|
|
|
|
|
2005-08-03 23:14:59 +00:00
|
|
|
void CL_DrawPrydonCursor(void)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
if (cursor_active && cl_prydoncursor.ival)
|
2005-08-03 23:14:59 +00:00
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
SCR_DrawCursor(cl_prydoncursor.ival);
|
|
|
|
V_StopPitchDrift (0);
|
2005-08-03 23:14:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void CL_UpdatePrydonCursor(usercmd_t *from, float cursor_screen[2], vec3_t cursor_start, vec3_t cursor_impact, int *entnum)
|
2004-12-05 08:19:54 +00:00
|
|
|
{
|
|
|
|
vec3_t cursor_end;
|
|
|
|
|
2005-08-03 23:14:59 +00:00
|
|
|
vec3_t temp;
|
|
|
|
vec3_t cursor_impact_normal;
|
2004-12-05 08:19:54 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
extern int mousecursor_x, mousecursor_y;
|
|
|
|
|
|
|
|
cursor_active = true;
|
|
|
|
|
|
|
|
if (!cl_prydoncursor.ival)
|
2004-12-05 08:19:54 +00:00
|
|
|
{ //center the cursor
|
|
|
|
cursor_screen[0] = 0;
|
|
|
|
cursor_screen[1] = 0;
|
|
|
|
}
|
2005-08-03 23:14:59 +00:00
|
|
|
else
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
cursor_screen[0] = mousecursor_x/(vid.width/2.0f) - 1;
|
|
|
|
cursor_screen[1] = mousecursor_y/(vid.height/2.0f) - 1;
|
2005-08-03 23:14:59 +00:00
|
|
|
if (cursor_screen[0] < -1)
|
|
|
|
cursor_screen[0] = -1;
|
|
|
|
if (cursor_screen[1] < -1)
|
|
|
|
cursor_screen[1] = -1;
|
|
|
|
|
|
|
|
if (cursor_screen[0] > 1)
|
|
|
|
cursor_screen[0] = 1;
|
|
|
|
if (cursor_screen[1] > 1)
|
|
|
|
cursor_screen[1] = 1;
|
|
|
|
}
|
2004-12-05 08:19:54 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
if (cl.cmd.cursor_screen[0] < -1)
|
|
|
|
{
|
|
|
|
cl.viewangles[YAW] -= m_yaw.value * (cl.cmd.cursor_screen[0] - -1) * vid.realwidth * sensitivity.value * cl.viewzoom;
|
|
|
|
cl.cmd.cursor_screen[0] = -1;
|
|
|
|
}
|
|
|
|
if (cl.cmd.cursor_screen[0] > 1)
|
|
|
|
{
|
|
|
|
cl.viewangles[YAW] -= m_yaw.value * (cl.cmd.cursor_screen[0] - 1) * vid.realwidth * sensitivity.value * cl.viewzoom;
|
|
|
|
cl.cmd.cursor_screen[0] = 1;
|
|
|
|
}
|
|
|
|
if (cl.cmd.cursor_screen[1] < -1)
|
|
|
|
{
|
|
|
|
cl.viewangles[PITCH] += m_pitch.value * (cl.cmd.cursor_screen[1] - -1) * vid.realheight * sensitivity.value * cl.viewzoom;
|
|
|
|
cl.cmd.cursor_screen[1] = -1;
|
|
|
|
}
|
|
|
|
if (cl.cmd.cursor_screen[1] > 1)
|
|
|
|
{
|
|
|
|
cl.viewangles[PITCH] += m_pitch.value * (cl.cmd.cursor_screen[1] - 1) * vid.realheight * sensitivity.value * cl.viewzoom;
|
|
|
|
cl.cmd.cursor_screen[1] = 1;
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
|
2006-05-29 04:50:24 +00:00
|
|
|
VectorClear(cursor_start);
|
2005-08-03 23:14:59 +00:00
|
|
|
temp[0] = (cursor_screen[0]+1)/2;
|
|
|
|
temp[1] = (-cursor_screen[1]+1)/2;
|
|
|
|
temp[2] = 1;
|
2004-12-05 08:19:54 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
VectorCopy(r_origin, cursor_start);
|
|
|
|
Matrix4_UnProject(temp, cursor_end, cl.viewangles[0], cursor_start, r_refdef.fov_x, r_refdef.fov_y);
|
2005-08-03 23:14:59 +00:00
|
|
|
VectorScale(cursor_end, 100000, cursor_end);
|
2004-12-05 08:19:54 +00:00
|
|
|
|
2005-02-06 02:47:36 +00:00
|
|
|
CL_SetSolidEntities();
|
|
|
|
//don't bother with players, they don't exist in NQ...
|
|
|
|
|
2005-08-03 23:14:59 +00:00
|
|
|
TraceLineN(cursor_start, cursor_end, cursor_impact, cursor_impact_normal);
|
2004-12-05 08:19:54 +00:00
|
|
|
// CL_SelectTraceLine(cursor_start, cursor_end, cursor_impact, entnum);
|
|
|
|
// makes sparks where cursor is
|
|
|
|
//CL_SparkShower(cl.cmd.cursor_impact, cl.cmd.cursor_normal, 5, 0);
|
2005-08-03 23:14:59 +00:00
|
|
|
// P_RunParticleEffectType(cursor_impact, vec3_origin, 1, pt_gunshot);
|
2005-05-26 12:55:34 +00:00
|
|
|
//P_ParticleTrail(cursor_start, cursor_impact, 0, NULL);
|
2004-12-05 08:19:54 +00:00
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
#ifdef NQPROT
|
2008-06-12 20:47:13 +00:00
|
|
|
void CLNQ_SendMove (usercmd_t *cmd, int pnum, sizebuf_t *buf)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int i;
|
2004-12-05 08:19:54 +00:00
|
|
|
|
|
|
|
vec3_t cursor_start, cursor_impact;
|
|
|
|
int cursor_entitynumber=0;//I hate warnings as errors
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-05-26 12:55:34 +00:00
|
|
|
if (cls.demoplayback!=DPB_NONE)
|
|
|
|
return; //err... don't bother... :)
|
|
|
|
//
|
2005-07-28 15:33:27 +00:00
|
|
|
// always dump the first two message, because it may contain leftover inputs
|
2005-05-26 12:55:34 +00:00
|
|
|
// from the last level
|
|
|
|
//
|
|
|
|
if (++cl.movemessages <= 2)
|
|
|
|
return;
|
|
|
|
|
|
|
|
MSG_WriteByte (buf, clc_move);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
if (cls.protocol_nq >= CPNQ_DP7)
|
2007-06-20 00:02:54 +00:00
|
|
|
MSG_WriteLong(buf, cls.netchan.outgoing_sequence);
|
2005-05-26 12:55:34 +00:00
|
|
|
|
|
|
|
MSG_WriteFloat (buf, cl.gametime); // so server can get ping times
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
for (i=0 ; i<3 ; i++)
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
{
|
|
|
|
if (cls.protocol_nq == CPNQ_FITZ666)
|
|
|
|
MSG_WriteAngle16 (buf, cl.viewangles[pnum][i]);
|
|
|
|
else
|
|
|
|
MSG_WriteAngle (buf, cl.viewangles[pnum][i]);
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-05-26 12:55:34 +00:00
|
|
|
MSG_WriteShort (buf, cmd->forwardmove);
|
|
|
|
MSG_WriteShort (buf, cmd->sidemove);
|
|
|
|
MSG_WriteShort (buf, cmd->upmove);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
if (cls.protocol_nq >= CPNQ_DP6)
|
2004-12-05 08:19:54 +00:00
|
|
|
{
|
2005-08-03 23:14:59 +00:00
|
|
|
CL_UpdatePrydonCursor(cmd, cursor_screen, cursor_start, cursor_impact, &cursor_entitynumber);
|
2009-01-30 02:50:01 +00:00
|
|
|
MSG_WriteLong (buf, cmd->buttons);
|
2004-12-05 08:19:54 +00:00
|
|
|
}
|
|
|
|
else
|
2009-01-30 02:50:01 +00:00
|
|
|
MSG_WriteByte (buf, cmd->buttons);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-01-30 02:50:01 +00:00
|
|
|
|
|
|
|
MSG_WriteByte (buf, cmd->impulse);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
if (cls.protocol_nq >= CPNQ_DP6)
|
2004-12-05 08:19:54 +00:00
|
|
|
{
|
2005-05-26 12:55:34 +00:00
|
|
|
MSG_WriteShort (buf, cursor_screen[0] * 32767.0f);
|
|
|
|
MSG_WriteShort (buf, cursor_screen[1] * 32767.0f);
|
|
|
|
MSG_WriteFloat (buf, cursor_start[0]);
|
|
|
|
MSG_WriteFloat (buf, cursor_start[1]);
|
|
|
|
MSG_WriteFloat (buf, cursor_start[2]);
|
|
|
|
MSG_WriteFloat (buf, cursor_impact[0]);
|
|
|
|
MSG_WriteFloat (buf, cursor_impact[1]);
|
|
|
|
MSG_WriteFloat (buf, cursor_impact[2]);
|
|
|
|
MSG_WriteShort (buf, cursor_entitynumber);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
2005-05-26 12:55:34 +00:00
|
|
|
|
2006-05-06 02:53:36 +00:00
|
|
|
void Name_Callback(struct cvar_s *var, char *oldvalue)
|
|
|
|
{
|
|
|
|
if (cls.state <= ca_connected)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (cls.protocol != CP_NETQUAKE)
|
|
|
|
return;
|
|
|
|
|
|
|
|
CL_SendClientCommand(true, "name \"%s\"\n", var->string);
|
|
|
|
}
|
|
|
|
|
2008-06-12 20:47:13 +00:00
|
|
|
void CLNQ_SendCmd(sizebuf_t *buf)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
extern int cl_latestframenum;
|
2005-05-26 12:55:34 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
if (cls.signon == 4)
|
|
|
|
{
|
|
|
|
// send the unreliable message
|
2005-05-26 12:55:34 +00:00
|
|
|
if (independantphysics[0].impulse && !cls.netchan.message.cursize)
|
|
|
|
CLNQ_SendMove (&independantphysics[0], 0, &cls.netchan.message);
|
|
|
|
else
|
2008-06-12 20:47:13 +00:00
|
|
|
CLNQ_SendMove (&independantphysics[0], 0, buf);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
if (CPNQ_IS_DP && cls.signon == 4)
|
2004-11-27 08:16:25 +00:00
|
|
|
{
|
2008-11-09 22:29:28 +00:00
|
|
|
MSG_WriteByte(buf, clcdp_ackframe);
|
|
|
|
MSG_WriteLong(buf, cl_latestframenum);
|
2004-11-27 08:16:25 +00:00
|
|
|
}
|
|
|
|
|
2005-05-26 12:55:34 +00:00
|
|
|
memset(&independantphysics[0], 0, sizeof(independantphysics[0]));
|
|
|
|
cl.allowsendpacket = false;
|
2006-05-28 21:56:04 +00:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
void Name_Callback(struct cvar_s *var, char *oldvalue)
|
|
|
|
{
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-04-16 16:21:27 +00:00
|
|
|
float CL_FilterTime (double time, float wantfps) //now returns the extra time not taken in this slot. Note that negative 1 means uncapped.
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
float fps, fpscap;
|
|
|
|
|
2005-09-08 02:06:16 +00:00
|
|
|
if (cls.timedemo || cls.protocol == CP_QUAKE3)
|
2005-04-16 16:21:27 +00:00
|
|
|
return -1;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-12-21 03:07:33 +00:00
|
|
|
if (cls.demoplayback != DPB_NONE || cls.protocol != CP_QUAKEWORLD)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-02-28 07:16:19 +00:00
|
|
|
if (!wantfps)
|
2005-04-16 16:21:27 +00:00
|
|
|
return -1;
|
2005-02-28 07:16:19 +00:00
|
|
|
fps = max (30.0, wantfps);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fpscap = cls.maxfps ? max (30.0, cls.maxfps) : 0x7fff;
|
2008-11-09 22:29:28 +00:00
|
|
|
#ifdef IRCCONNECT
|
|
|
|
if (cls.netchan.remote_address.type == NA_IRC)
|
|
|
|
fps = bound (0.1, wantfps, fpscap); //if we're connected via irc, allow a greatly reduced minimum cap
|
|
|
|
else
|
|
|
|
#endif
|
2005-06-14 04:52:10 +00:00
|
|
|
if (wantfps < 1)
|
|
|
|
fps = fpscap;
|
2004-08-23 00:15:46 +00:00
|
|
|
else
|
2006-11-03 15:53:04 +00:00
|
|
|
fps = bound (6.7, wantfps, fpscap); //we actually cap ourselves to 150msecs (1000/7 = 142)
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (time < 1000 / fps)
|
|
|
|
return false;
|
|
|
|
|
2005-04-16 16:21:27 +00:00
|
|
|
return time - (1000 / fps);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2005-02-28 07:16:19 +00:00
|
|
|
qboolean allowindepphys;
|
|
|
|
|
|
|
|
typedef struct clcmdbuf_s {
|
|
|
|
struct clcmdbuf_s *next;
|
|
|
|
int len;
|
2005-03-23 22:14:08 +00:00
|
|
|
qboolean reliable;
|
2005-02-28 07:16:19 +00:00
|
|
|
char command[4]; //this is dynamically allocated, so this is variably sized.
|
|
|
|
} clcmdbuf_t;
|
|
|
|
clcmdbuf_t *clientcmdlist;
|
2005-03-23 22:14:08 +00:00
|
|
|
void VARGS CL_SendClientCommand(qboolean reliable, char *format, ...)
|
2005-02-28 07:16:19 +00:00
|
|
|
{
|
|
|
|
qboolean oldallow;
|
|
|
|
va_list argptr;
|
|
|
|
char string[2048];
|
|
|
|
clcmdbuf_t *buf, *prev;
|
|
|
|
|
2008-01-09 00:52:31 +00:00
|
|
|
if (cls.demoplayback && cls.demoplayback != DPB_EZTV)
|
2006-01-21 00:06:49 +00:00
|
|
|
return; //no point.
|
|
|
|
|
2005-02-28 07:16:19 +00:00
|
|
|
va_start (argptr, format);
|
2006-03-06 01:41:09 +00:00
|
|
|
vsnprintf (string,sizeof(string)-1, format,argptr);
|
2005-02-28 07:16:19 +00:00
|
|
|
va_end (argptr);
|
|
|
|
|
|
|
|
|
2005-11-30 01:20:53 +00:00
|
|
|
Con_DPrintf("Queing stringcmd %s\n", string);
|
2005-02-28 07:16:19 +00:00
|
|
|
|
|
|
|
#ifdef Q3CLIENT
|
2005-06-04 04:20:20 +00:00
|
|
|
if (cls.protocol == CP_QUAKE3)
|
2005-02-28 07:16:19 +00:00
|
|
|
{
|
|
|
|
CLQ3_SendClientCommand("%s", string);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
oldallow = allowindepphys;
|
|
|
|
CL_AllowIndependantSendCmd(false);
|
|
|
|
|
|
|
|
buf = Z_Malloc(sizeof(*buf)+strlen(string));
|
|
|
|
strcpy(buf->command, string);
|
|
|
|
buf->len = strlen(buf->command);
|
2005-03-23 22:14:08 +00:00
|
|
|
buf->reliable = reliable;
|
2005-02-28 07:16:19 +00:00
|
|
|
|
|
|
|
//add to end of the list so that the first of the list is the first to be sent.
|
|
|
|
if (!clientcmdlist)
|
|
|
|
clientcmdlist = buf;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (prev = clientcmdlist; prev->next; prev=prev->next)
|
|
|
|
;
|
|
|
|
prev->next = buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
CL_AllowIndependantSendCmd(oldallow);
|
|
|
|
}
|
|
|
|
|
2005-05-30 10:36:26 +00:00
|
|
|
int CL_RemoveClientCommands(char *command)
|
|
|
|
{
|
|
|
|
clcmdbuf_t *next, *first;
|
|
|
|
int removed = 0;
|
2005-08-07 18:08:13 +00:00
|
|
|
int len = strlen(command);
|
2005-05-30 10:36:26 +00:00
|
|
|
|
|
|
|
CL_AllowIndependantSendCmd(false);
|
|
|
|
|
|
|
|
if (!clientcmdlist)
|
|
|
|
return 0;
|
|
|
|
|
2005-08-07 18:08:13 +00:00
|
|
|
while(!strncmp(clientcmdlist->command, command, len))
|
2005-05-30 10:36:26 +00:00
|
|
|
{
|
|
|
|
next = clientcmdlist->next;
|
|
|
|
Z_Free(clientcmdlist);
|
|
|
|
clientcmdlist=next;
|
|
|
|
removed++;
|
|
|
|
|
|
|
|
if (!clientcmdlist)
|
|
|
|
return removed;
|
|
|
|
}
|
2005-06-14 04:52:10 +00:00
|
|
|
first = clientcmdlist;
|
2005-05-30 10:36:26 +00:00
|
|
|
while(first->next)
|
|
|
|
{
|
2005-08-07 18:08:13 +00:00
|
|
|
if (!strncmp(first->next->command, command, len))
|
2005-05-30 10:36:26 +00:00
|
|
|
{
|
|
|
|
next = first->next->next;
|
|
|
|
Z_Free(first->next);
|
|
|
|
first->next = next;
|
|
|
|
removed++;
|
|
|
|
}
|
2005-06-04 04:20:20 +00:00
|
|
|
else
|
|
|
|
first = first->next;
|
2005-05-30 10:36:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return removed;
|
|
|
|
}
|
|
|
|
|
2005-02-28 07:16:19 +00:00
|
|
|
void CL_FlushClientCommands(void)
|
|
|
|
{
|
|
|
|
clcmdbuf_t *next;
|
|
|
|
CL_AllowIndependantSendCmd(false);
|
|
|
|
|
|
|
|
while(clientcmdlist)
|
|
|
|
{
|
2005-05-30 10:36:26 +00:00
|
|
|
Con_DPrintf("Flushed command %s\n", clientcmdlist->command);
|
2005-02-28 07:16:19 +00:00
|
|
|
next = clientcmdlist->next;
|
|
|
|
Z_Free(clientcmdlist);
|
|
|
|
clientcmdlist=next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
qboolean runningindepphys;
|
2005-03-24 17:19:25 +00:00
|
|
|
#ifdef _WIN32
|
2005-02-28 07:16:19 +00:00
|
|
|
CRITICAL_SECTION indepcriticialsection;
|
|
|
|
HANDLE indepphysicsthread;
|
|
|
|
void CL_AllowIndependantSendCmd(qboolean allow)
|
|
|
|
{
|
|
|
|
if (!runningindepphys)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (allowindepphys != allow && runningindepphys)
|
|
|
|
{
|
|
|
|
if (allow)
|
|
|
|
LeaveCriticalSection(&indepcriticialsection);
|
|
|
|
else
|
|
|
|
EnterCriticalSection(&indepcriticialsection);
|
2005-03-12 23:40:42 +00:00
|
|
|
allowindepphys = allow;
|
2005-02-28 07:16:19 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
unsigned long _stdcall CL_IndepPhysicsThread(void *param)
|
|
|
|
{
|
|
|
|
int sleeptime;
|
|
|
|
float fps;
|
2009-11-04 21:16:50 +00:00
|
|
|
unsigned int time, lasttime;
|
2006-11-03 15:53:04 +00:00
|
|
|
float spare;
|
2009-11-04 21:16:50 +00:00
|
|
|
lasttime = Sys_Milliseconds();
|
2005-02-28 07:16:19 +00:00
|
|
|
while(1)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
time = Sys_Milliseconds();
|
|
|
|
spare = CL_FilterTime((time - lasttime), cl_netfps.value);
|
2006-11-03 15:53:04 +00:00
|
|
|
if (spare)
|
|
|
|
{
|
2007-07-23 18:52:11 +00:00
|
|
|
//don't let them bank too much and get sudden bursts
|
|
|
|
if (spare > 15)
|
|
|
|
spare = 15;
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
time -= spare;
|
2006-11-03 15:53:04 +00:00
|
|
|
EnterCriticalSection(&indepcriticialsection);
|
|
|
|
if (cls.state)
|
2009-05-24 10:11:17 +00:00
|
|
|
{
|
|
|
|
Sys_SendKeyEvents();
|
|
|
|
CL_SendCmd(time - lasttime, false);
|
|
|
|
}
|
2006-11-03 15:53:04 +00:00
|
|
|
lasttime = time;
|
|
|
|
LeaveCriticalSection(&indepcriticialsection);
|
|
|
|
}
|
2005-02-28 07:16:19 +00:00
|
|
|
|
2005-03-12 23:40:42 +00:00
|
|
|
fps = cl_netfps.value;
|
2005-05-30 10:36:26 +00:00
|
|
|
if (fps < 4)
|
|
|
|
fps = 4;
|
|
|
|
while (fps < 100)
|
|
|
|
fps*=2;
|
2005-02-28 07:16:19 +00:00
|
|
|
|
|
|
|
sleeptime = 1000/fps;
|
|
|
|
|
2005-06-04 04:20:20 +00:00
|
|
|
if (sleeptime)
|
|
|
|
Sleep(sleeptime);
|
2006-11-03 15:53:04 +00:00
|
|
|
else
|
|
|
|
Sleep(1);
|
2005-02-28 07:16:19 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void CL_UseIndepPhysics(qboolean allow)
|
|
|
|
{
|
|
|
|
if (runningindepphys == allow)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (allow)
|
|
|
|
{ //enable it
|
|
|
|
DWORD tid; //*sigh*...
|
2006-11-03 15:53:04 +00:00
|
|
|
|
|
|
|
// TIMECAPS tc;
|
|
|
|
// timeGetDevCaps(&tc, sizeof(TIMECAPS));
|
|
|
|
// Con_Printf("Timer has a resolution of %i millisecond%s\n", tc.wPeriodMin, tc.wPeriodMin!=1?"s":"");
|
|
|
|
|
2005-02-28 07:16:19 +00:00
|
|
|
InitializeCriticalSection(&indepcriticialsection);
|
|
|
|
runningindepphys = true;
|
|
|
|
|
|
|
|
indepphysicsthread = CreateThread(NULL, 8192, CL_IndepPhysicsThread, NULL, 0, &tid);
|
2005-03-12 23:40:42 +00:00
|
|
|
allowindepphys = 1;
|
2006-11-03 15:53:04 +00:00
|
|
|
|
|
|
|
SetThreadPriority(independantphysics, HIGH_PRIORITY_CLASS);
|
2005-02-28 07:16:19 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
//shut it down.
|
|
|
|
|
|
|
|
EnterCriticalSection(&indepcriticialsection);
|
|
|
|
TerminateThread(indepphysicsthread, 0);
|
|
|
|
CloseHandle(indepphysicsthread);
|
|
|
|
LeaveCriticalSection(&indepcriticialsection);
|
2005-03-12 23:40:42 +00:00
|
|
|
DeleteCriticalSection(&indepcriticialsection);
|
2005-02-28 07:16:19 +00:00
|
|
|
|
|
|
|
runningindepphys = false;
|
|
|
|
}
|
|
|
|
}
|
2007-07-23 18:52:11 +00:00
|
|
|
|
|
|
|
#elif defined(__linux__)
|
|
|
|
|
|
|
|
#include <pthread.h>
|
|
|
|
|
|
|
|
pthread_mutex_t indepcriticalsection;
|
|
|
|
pthread_t indepphysicsthread;
|
|
|
|
|
|
|
|
void CL_AllowIndependantSendCmd(qboolean allow)
|
|
|
|
{
|
|
|
|
if (!runningindepphys)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (allowindepphys != allow && runningindepphys)
|
|
|
|
{
|
|
|
|
if (allow)
|
|
|
|
pthread_mutex_unlock(&indepcriticalsection);
|
|
|
|
else
|
|
|
|
pthread_mutex_lock(&indepcriticalsection);
|
|
|
|
allowindepphys = allow;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void *CL_IndepPhysicsThread(void *param)
|
|
|
|
{
|
|
|
|
int sleeptime;
|
|
|
|
double fps;
|
|
|
|
double time, lasttime;
|
|
|
|
double spare;
|
|
|
|
lasttime = Sys_DoubleTime();
|
|
|
|
while(runningindepphys)
|
|
|
|
{
|
|
|
|
time = Sys_DoubleTime();
|
|
|
|
spare = CL_FilterTime((time - lasttime)*1000, cl_netfps.value);
|
|
|
|
if (spare)
|
|
|
|
{
|
|
|
|
//don't let them bank too much and get sudden bursts
|
|
|
|
if (spare > 15)
|
|
|
|
spare = 15;
|
|
|
|
|
|
|
|
time -= spare/1000.0f;
|
|
|
|
pthread_mutex_lock(&indepcriticalsection);
|
|
|
|
if (cls.state)
|
2009-05-24 10:11:17 +00:00
|
|
|
CL_SendCmd(time - lasttime, false);
|
2007-07-23 18:52:11 +00:00
|
|
|
lasttime = time;
|
|
|
|
pthread_mutex_unlock(&indepcriticalsection);
|
|
|
|
}
|
|
|
|
|
|
|
|
fps = cl_netfps.value;
|
|
|
|
if (fps < 4)
|
|
|
|
fps = 4;
|
|
|
|
while (fps < 100)
|
|
|
|
fps*=2;
|
|
|
|
|
|
|
|
sleeptime = (1000*1000)/fps;
|
|
|
|
|
|
|
|
if (sleeptime)
|
|
|
|
usleep(sleeptime);
|
|
|
|
else
|
|
|
|
usleep(1);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void CL_UseIndepPhysics(qboolean allow)
|
|
|
|
{
|
|
|
|
if (runningindepphys == allow)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (allow)
|
|
|
|
{ //enable it
|
|
|
|
pthread_mutex_init(&indepcriticalsection, NULL);
|
|
|
|
runningindepphys = true;
|
|
|
|
|
|
|
|
pthread_create(&indepphysicsthread, NULL, CL_IndepPhysicsThread, NULL);
|
|
|
|
allowindepphys = 1;
|
|
|
|
|
|
|
|
//now this would be awesome, but would require root permissions... which is plain wrong!
|
|
|
|
//however, lack of this line means its really duel-core only.
|
|
|
|
//pthread_setschedparam(indepthread, SCHED_*, ?);
|
|
|
|
//is there anything to weight the thread up a bit against the main thread? (considering that most of the time we'll be idling)
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
//shut it down.
|
|
|
|
runningindepphys = false; //tell thread to exit gracefully
|
|
|
|
|
|
|
|
pthread_mutex_lock(&indepcriticalsection);
|
|
|
|
pthread_join(indepphysicsthread, 0);
|
|
|
|
pthread_mutex_unlock(&indepcriticalsection);
|
|
|
|
pthread_mutex_destroy(&indepcriticalsection);
|
|
|
|
}
|
|
|
|
}
|
2005-02-28 07:16:19 +00:00
|
|
|
#else
|
|
|
|
void CL_AllowIndependantSendCmd(qboolean allow)
|
|
|
|
{
|
|
|
|
}
|
2005-03-24 17:19:25 +00:00
|
|
|
void CL_UseIndepPhysics(qboolean allow)
|
|
|
|
{
|
|
|
|
}
|
2005-02-28 07:16:19 +00:00
|
|
|
#endif
|
|
|
|
|
2008-06-12 20:47:13 +00:00
|
|
|
void CL_SpareMsec_Callback (struct cvar_s *var, char *oldvalue)
|
|
|
|
{
|
|
|
|
if (var->value > 50)
|
|
|
|
{
|
|
|
|
Cvar_ForceSet(var, "50");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else if (var->value < 0)
|
|
|
|
{
|
|
|
|
Cvar_ForceSet(var, "0");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
=================
|
|
|
|
CL_SendCmd
|
|
|
|
=================
|
|
|
|
*/
|
|
|
|
vec3_t accum[MAX_SPLITS];
|
2008-06-12 20:47:13 +00:00
|
|
|
qboolean CL_WriteDeltas (int plnum, sizebuf_t *buf)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
usercmd_t *cmd, *oldcmd;
|
|
|
|
qboolean dontdrop = false;
|
|
|
|
|
|
|
|
|
|
|
|
i = (cls.netchan.outgoing_sequence-2) & UPDATE_MASK;
|
|
|
|
cmd = &cl.frames[i].cmd[plnum];
|
2009-11-04 21:16:50 +00:00
|
|
|
if (cl_c2sImpulseBackup.ival >= 2)
|
2008-06-12 20:47:13 +00:00
|
|
|
dontdrop = dontdrop || cmd->impulse;
|
|
|
|
MSG_WriteDeltaUsercmd (buf, &nullcmd, cmd);
|
|
|
|
oldcmd = cmd;
|
|
|
|
|
|
|
|
i = (cls.netchan.outgoing_sequence-1) & UPDATE_MASK;
|
2009-11-04 21:16:50 +00:00
|
|
|
if (cl_c2sImpulseBackup.ival >= 3)
|
2008-06-12 20:47:13 +00:00
|
|
|
dontdrop = dontdrop || cmd->impulse;
|
|
|
|
cmd = &cl.frames[i].cmd[plnum];
|
|
|
|
MSG_WriteDeltaUsercmd (buf, oldcmd, cmd);
|
|
|
|
oldcmd = cmd;
|
|
|
|
|
|
|
|
i = (cls.netchan.outgoing_sequence) & UPDATE_MASK;
|
2009-11-04 21:16:50 +00:00
|
|
|
if (cl_c2sImpulseBackup.ival >= 1)
|
2008-06-12 20:47:13 +00:00
|
|
|
dontdrop = dontdrop || cmd->impulse;
|
|
|
|
cmd = &cl.frames[i].cmd[plnum];
|
|
|
|
MSG_WriteDeltaUsercmd (buf, oldcmd, cmd);
|
|
|
|
|
|
|
|
return dontdrop;
|
|
|
|
}
|
|
|
|
|
2008-06-12 20:49:42 +00:00
|
|
|
#ifdef Q2CLIENT
|
2008-06-12 20:47:13 +00:00
|
|
|
qboolean CL_SendCmdQ2 (sizebuf_t *buf)
|
|
|
|
{
|
|
|
|
int seq_hash;
|
|
|
|
qboolean dontdrop;
|
|
|
|
usercmd_t *cmd;
|
|
|
|
int checksumIndex, i;
|
|
|
|
qbyte lightlev;
|
|
|
|
|
|
|
|
seq_hash = cls.netchan.outgoing_sequence;
|
|
|
|
|
|
|
|
// send this and the previous cmds in the message, so
|
|
|
|
// if the last packet was dropped, it can be recovered
|
|
|
|
i = cls.netchan.outgoing_sequence & UPDATE_MASK;
|
|
|
|
cmd = &cl.frames[i].cmd[0];
|
|
|
|
|
|
|
|
if (cls.resendinfo)
|
|
|
|
{
|
|
|
|
MSG_WriteByte (&cls.netchan.message, clcq2_userinfo);
|
|
|
|
MSG_WriteString (&cls.netchan.message, cls.userinfo);
|
|
|
|
|
|
|
|
cls.resendinfo = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
MSG_WriteByte (buf, clcq2_move);
|
|
|
|
|
|
|
|
// save the position for a checksum qbyte
|
|
|
|
checksumIndex = buf->cursize;
|
|
|
|
MSG_WriteByte (buf, 0);
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (!cl.q2frame.valid || cl_nodelta.ival)
|
2008-06-12 20:47:13 +00:00
|
|
|
MSG_WriteLong (buf, -1); // no compression
|
|
|
|
else
|
|
|
|
MSG_WriteLong (buf, cl.q2frame.serverframe);
|
|
|
|
|
|
|
|
if (R_LightPoint)
|
|
|
|
lightlev = R_LightPoint(cl.simorg[0]);
|
|
|
|
else
|
|
|
|
lightlev = 255;
|
|
|
|
|
|
|
|
// msecs = msecs - (double)msecstouse;
|
|
|
|
|
|
|
|
i = cls.netchan.outgoing_sequence & UPDATE_MASK;
|
|
|
|
cmd = &cl.frames[i].cmd[0];
|
|
|
|
*cmd = independantphysics[0];
|
|
|
|
|
|
|
|
cmd->lightlevel = lightlev;
|
|
|
|
|
|
|
|
cl.frames[i].senttime = realtime;
|
|
|
|
cl.frames[i].receivedtime = -1; // we haven't gotten a reply yet
|
|
|
|
memset(&independantphysics[0], 0, sizeof(independantphysics[0]));
|
|
|
|
|
|
|
|
if (cmd->buttons)
|
|
|
|
cmd->buttons |= 128; //fixme: this isn't really what's meant by the anykey.
|
|
|
|
|
|
|
|
// calculate a checksum over the move commands
|
|
|
|
dontdrop = CL_WriteDeltas(0, buf);
|
|
|
|
|
|
|
|
buf->data[checksumIndex] = Q2COM_BlockSequenceCRCByte(
|
|
|
|
buf->data + checksumIndex + 1, buf->cursize - checksumIndex - 1,
|
|
|
|
seq_hash);
|
|
|
|
|
|
|
|
cl.frames[cls.netchan.outgoing_sequence&UPDATE_MASK].delta_sequence = -1;
|
|
|
|
|
|
|
|
if (cl.sendprespawn)
|
|
|
|
buf->cursize = 0; //tastyspleen.net is alergic.
|
|
|
|
|
|
|
|
return dontdrop;
|
|
|
|
}
|
2008-06-12 20:49:42 +00:00
|
|
|
#endif
|
2008-06-12 20:47:13 +00:00
|
|
|
|
|
|
|
qboolean CL_SendCmdQW (sizebuf_t *buf)
|
|
|
|
{
|
|
|
|
int seq_hash;
|
|
|
|
qboolean dontdrop = false;
|
|
|
|
usercmd_t *cmd;
|
2009-11-04 21:16:50 +00:00
|
|
|
int checksumIndex, firstsize, plnum;
|
2008-06-12 20:47:13 +00:00
|
|
|
int clientcount, lost;
|
2009-11-04 21:16:50 +00:00
|
|
|
int curframe = cls.netchan.outgoing_sequence & UPDATE_MASK;
|
2008-06-12 20:47:13 +00:00
|
|
|
|
|
|
|
seq_hash = cls.netchan.outgoing_sequence;
|
|
|
|
|
|
|
|
// send this and the previous cmds in the message, so
|
|
|
|
// if the last packet was dropped, it can be recovered
|
|
|
|
clientcount = cl.splitclients;
|
|
|
|
|
|
|
|
if (!clientcount)
|
|
|
|
clientcount = 1;
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
|
|
|
|
for (plnum = 0; plnum<clientcount; plnum++)
|
|
|
|
{
|
|
|
|
cmd = &cl.frames[curframe].cmd[plnum];
|
|
|
|
*cmd = independantphysics[plnum];
|
|
|
|
|
|
|
|
cmd->lightlevel = 0;
|
|
|
|
#ifdef CSQC_DAT
|
|
|
|
CSQC_Input_Frame(plnum, cmd);
|
|
|
|
#endif
|
|
|
|
memset(&independantphysics[plnum], 0, sizeof(independantphysics[plnum]));
|
|
|
|
}
|
|
|
|
cl.frames[curframe].senttime = realtime;
|
|
|
|
cl.frames[curframe].receivedtime = -1; // we haven't gotten a reply yet
|
|
|
|
|
|
|
|
|
2009-11-07 04:32:07 +00:00
|
|
|
if ((cls.fteprotocolextensions2 & PEXT2_PRYDONCURSOR) && *cl_prydoncursor.string && cls.state == ca_active)
|
2009-11-04 21:16:50 +00:00
|
|
|
{
|
|
|
|
vec3_t cursor_start, cursor_impact;
|
|
|
|
int cursor_entitynumber = 0;
|
|
|
|
cmd = &cl.frames[curframe].cmd[0];
|
|
|
|
CL_UpdatePrydonCursor(cmd, cursor_screen, cursor_start, cursor_impact, &cursor_entitynumber);
|
|
|
|
MSG_WriteByte (buf, clc_prydoncursor);
|
|
|
|
MSG_WriteShort(buf, cursor_screen[0] * 32767.0f);
|
|
|
|
MSG_WriteShort(buf, cursor_screen[1] * 32767.0f);
|
|
|
|
MSG_WriteFloat(buf, cursor_start[0]);
|
|
|
|
MSG_WriteFloat(buf, cursor_start[1]);
|
|
|
|
MSG_WriteFloat(buf, cursor_start[2]);
|
|
|
|
MSG_WriteFloat(buf, cursor_impact[0]);
|
|
|
|
MSG_WriteFloat(buf, cursor_impact[1]);
|
|
|
|
MSG_WriteFloat(buf, cursor_impact[2]);
|
|
|
|
MSG_WriteShort(buf, cursor_entitynumber);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
cursor_active = false;
|
|
|
|
|
2008-06-12 20:47:13 +00:00
|
|
|
MSG_WriteByte (buf, clc_move);
|
|
|
|
|
|
|
|
// save the position for a checksum qbyte
|
|
|
|
checksumIndex = buf->cursize;
|
|
|
|
MSG_WriteByte (buf, 0);
|
|
|
|
|
|
|
|
// write our lossage percentage
|
|
|
|
lost = CL_CalcNet();
|
|
|
|
MSG_WriteByte (buf, (qbyte)lost);
|
|
|
|
|
|
|
|
firstsize=0;
|
|
|
|
for (plnum = 0; plnum<clientcount; plnum++)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
cmd = &cl.frames[curframe].cmd[plnum];
|
2008-06-12 20:47:13 +00:00
|
|
|
|
|
|
|
if (plnum)
|
|
|
|
MSG_WriteByte (buf, clc_move);
|
|
|
|
|
2010-08-12 09:04:05 +00:00
|
|
|
dontdrop = CL_WriteDeltas(plnum, buf) || dontdrop;
|
2008-06-12 20:47:13 +00:00
|
|
|
|
|
|
|
if (!firstsize)
|
|
|
|
firstsize = buf->cursize;
|
|
|
|
}
|
|
|
|
|
|
|
|
// calculate a checksum over the move commands
|
|
|
|
|
|
|
|
buf->data[checksumIndex] = COM_BlockSequenceCRCByte(
|
|
|
|
buf->data + checksumIndex + 1, firstsize - checksumIndex - 1,
|
|
|
|
seq_hash);
|
|
|
|
|
|
|
|
// request delta compression of entities
|
|
|
|
if (cls.netchan.outgoing_sequence - cl.validsequence >= UPDATE_BACKUP-1)
|
|
|
|
cl.validsequence = 0;
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (cl.validsequence && !cl_nodelta.ival && cls.state == ca_active && !cls.demorecording)
|
2008-06-12 20:47:13 +00:00
|
|
|
{
|
|
|
|
cl.frames[cls.netchan.outgoing_sequence&UPDATE_MASK].delta_sequence = cl.validsequence;
|
|
|
|
MSG_WriteByte (buf, clc_delta);
|
|
|
|
// Con_Printf("%i\n", cl.validsequence);
|
|
|
|
MSG_WriteByte (buf, cl.validsequence&255);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
cl.frames[cls.netchan.outgoing_sequence&UPDATE_MASK].delta_sequence = -1;
|
|
|
|
|
|
|
|
if (cl.sendprespawn)
|
|
|
|
buf->cursize = 0; //tastyspleen.net is alergic.
|
|
|
|
|
|
|
|
return dontdrop;
|
|
|
|
}
|
|
|
|
|
2009-05-24 10:11:17 +00:00
|
|
|
void CL_SendCmd (double frametime, qboolean mainloop)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
sizebuf_t buf;
|
|
|
|
qbyte data[512];
|
|
|
|
int i, plnum;
|
2008-06-12 20:47:13 +00:00
|
|
|
usercmd_t *cmd;
|
2005-05-26 12:55:34 +00:00
|
|
|
float wantfps;
|
2008-06-12 20:47:13 +00:00
|
|
|
qboolean fullsend;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
static float pps_balance = 0;
|
|
|
|
static int dropcount = 0;
|
2007-05-26 00:39:03 +00:00
|
|
|
static double msecs;
|
2004-08-23 00:15:46 +00:00
|
|
|
int msecstouse;
|
|
|
|
qboolean dontdrop=false;
|
|
|
|
|
2005-02-28 07:16:19 +00:00
|
|
|
extern cvar_t cl_maxfps;
|
2008-01-09 00:52:31 +00:00
|
|
|
clcmdbuf_t *next;
|
2005-02-28 07:16:19 +00:00
|
|
|
|
2009-05-24 10:11:17 +00:00
|
|
|
if (runningindepphys)
|
|
|
|
{
|
|
|
|
double curtime;
|
|
|
|
static double lasttime;
|
|
|
|
curtime = Sys_DoubleTime();
|
|
|
|
frametime = curtime - lasttime;
|
|
|
|
lasttime = curtime;
|
|
|
|
|
|
|
|
/* for (plnum = 0; plnum < cl.splitclients; plnum++)
|
|
|
|
{
|
|
|
|
CL_AdjustAngles(plnum, frametime);
|
|
|
|
IN_Move(mousemovements[plnum], plnum);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
|
2007-01-06 09:37:33 +00:00
|
|
|
CL_ProxyMenuHooks();
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
if (cls.demoplayback != DPB_NONE)
|
|
|
|
{
|
2008-01-09 00:52:31 +00:00
|
|
|
if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-06-07 04:40:16 +00:00
|
|
|
extern cvar_t cl_splitscreen;
|
2004-08-23 00:15:46 +00:00
|
|
|
i = cls.netchan.outgoing_sequence & UPDATE_MASK;
|
2004-12-08 04:14:52 +00:00
|
|
|
cl.frames[i].senttime = realtime; // we haven't gotten a reply yet
|
|
|
|
cl.frames[i].receivedtime = -1; // we haven't gotten a reply yet
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (cl.splitclients > cl_splitscreen.ival+1)
|
2005-06-07 04:40:16 +00:00
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
cl.splitclients = cl_splitscreen.ival+1;
|
2005-06-07 04:40:16 +00:00
|
|
|
if (cl.splitclients < 1)
|
|
|
|
cl.splitclients = 1;
|
|
|
|
}
|
|
|
|
for (plnum = 0; plnum < cl.splitclients; plnum++)
|
|
|
|
{
|
|
|
|
cmd = &cl.frames[i].cmd[0];
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-06-07 04:40:16 +00:00
|
|
|
memset(cmd, 0, sizeof(*cmd));
|
|
|
|
cmd->msec = frametime*1000;
|
|
|
|
independantphysics[0].msec = 0;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-05-24 10:11:17 +00:00
|
|
|
CL_AdjustAngles (plnum, frametime);
|
2005-06-07 04:40:16 +00:00
|
|
|
// get basic movement from keyboard
|
|
|
|
CL_BaseMove (cmd, plnum, 1, 1);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-06-07 04:40:16 +00:00
|
|
|
// allow mice or other external controllers to add to the move
|
2009-05-24 10:11:17 +00:00
|
|
|
IN_Move (mousemovements[plnum], plnum);
|
|
|
|
independantphysics[plnum].forwardmove += mousemovements[plnum][0];
|
|
|
|
independantphysics[plnum].sidemove += mousemovements[plnum][1];
|
|
|
|
independantphysics[plnum].upmove += mousemovements[plnum][2];
|
|
|
|
VectorClear(mousemovements[plnum]);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-06-07 04:40:16 +00:00
|
|
|
// if we are spectator, try autocam
|
|
|
|
if (cl.spectator)
|
|
|
|
Cam_Track(plnum, cmd);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-06-07 04:40:16 +00:00
|
|
|
CL_FinishMove(cmd, (int)(frametime*1000), plnum);
|
|
|
|
|
|
|
|
Cam_FinishMove(plnum, cmd);
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2008-01-09 00:52:31 +00:00
|
|
|
while (clientcmdlist)
|
|
|
|
{
|
|
|
|
next = clientcmdlist->next;
|
|
|
|
CL_Demo_ClientCommand(clientcmdlist->command);
|
|
|
|
Con_DPrintf("Sending stringcmd %s\n", clientcmdlist->command);
|
|
|
|
Z_Free(clientcmdlist);
|
|
|
|
clientcmdlist = next;
|
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
cls.netchan.outgoing_sequence++;
|
|
|
|
}
|
|
|
|
|
2009-07-18 19:47:37 +00:00
|
|
|
IN_Move (NULL, 0);
|
2004-08-23 00:15:46 +00:00
|
|
|
return; // sendcmds come from the demo
|
|
|
|
}
|
|
|
|
|
2005-03-23 22:14:08 +00:00
|
|
|
buf.maxsize = sizeof(data);
|
|
|
|
buf.cursize = 0;
|
|
|
|
buf.data = data;
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
buf.prim = cls.netchan.message.prim;
|
2005-03-23 22:14:08 +00:00
|
|
|
|
2008-11-09 22:29:28 +00:00
|
|
|
#ifdef IRCCONNECT
|
|
|
|
if (cls.netchan.remote_address.type != NA_IRC)
|
|
|
|
#endif
|
2005-03-28 00:11:59 +00:00
|
|
|
if (msecs>150) //q2 has 200 slop.
|
|
|
|
msecs=150;
|
|
|
|
|
2005-03-20 02:57:11 +00:00
|
|
|
msecs += frametime*1000;
|
2004-08-23 00:15:46 +00:00
|
|
|
// Con_Printf("%f\n", msecs);
|
|
|
|
|
2004-11-20 01:20:28 +00:00
|
|
|
if (msecs<0)
|
|
|
|
msecs=0; //erm.
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2008-06-12 20:47:13 +00:00
|
|
|
msecstouse = (int)msecs; //casts round down.
|
2009-05-24 10:11:17 +00:00
|
|
|
if (msecstouse == 0)
|
|
|
|
return;
|
2008-11-09 22:29:28 +00:00
|
|
|
#ifdef IRCCONNECT
|
|
|
|
if (cls.netchan.remote_address.type != NA_IRC)
|
|
|
|
#endif
|
2008-06-12 20:47:13 +00:00
|
|
|
if (msecstouse > 200) // cap at 200 to avoid servers splitting movement more than four times
|
|
|
|
msecstouse = 200;
|
2005-05-26 12:55:34 +00:00
|
|
|
|
2008-06-12 20:47:13 +00:00
|
|
|
// align msecstouse to avoid servers wasting our msecs
|
|
|
|
if (msecstouse > 100)
|
|
|
|
msecstouse &= ~3; // align to 4
|
|
|
|
else if (msecstouse > 50)
|
|
|
|
msecstouse &= ~1; // align to 2
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-05-26 12:55:34 +00:00
|
|
|
wantfps = cl_netfps.value<=0?cl_maxfps.value:cl_netfps.value;
|
|
|
|
if (wantfps < cls.maxfps ? max (30.0, cls.maxfps) : 0x7fff)
|
|
|
|
wantfps = cls.maxfps ? max (30.0, cls.maxfps) : 0x7fff;
|
|
|
|
|
2008-06-12 20:47:13 +00:00
|
|
|
fullsend = true;
|
|
|
|
|
2009-05-24 10:11:17 +00:00
|
|
|
if (!runningindepphys)
|
2008-06-12 20:47:13 +00:00
|
|
|
{
|
|
|
|
// while we're not playing send a slow keepalive fullsend to stop mvdsv from screwing up
|
2008-11-09 22:29:28 +00:00
|
|
|
if (cls.state < ca_active && CL_FilterTime(msecstouse,
|
|
|
|
#ifdef IRCCONNECT //don't spam irc.
|
|
|
|
cls.netchan.remote_address.type == NA_IRC?0.5:
|
|
|
|
#endif
|
|
|
|
12.5) == false)
|
2008-06-12 20:47:13 +00:00
|
|
|
fullsend = false;
|
|
|
|
else if (cl_netfps.value > 0)
|
|
|
|
{
|
|
|
|
int spare;
|
|
|
|
spare = CL_FilterTime(msecstouse, cl_netfps.value);
|
2008-11-09 22:29:28 +00:00
|
|
|
if (!spare && (msecstouse < 200
|
|
|
|
#ifdef IRCCONNECT
|
|
|
|
|| cls.netchan.remote_address.type == NA_IRC
|
|
|
|
#endif
|
|
|
|
))
|
2008-06-12 20:47:13 +00:00
|
|
|
fullsend = false;
|
2009-11-04 21:16:50 +00:00
|
|
|
if (spare > cl_sparemsec.ival)
|
|
|
|
spare = cl_sparemsec.ival;
|
2008-06-12 20:47:13 +00:00
|
|
|
if (spare > 0)
|
|
|
|
msecstouse -= spare;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-04-01 22:03:56 +00:00
|
|
|
#ifdef HLCLIENT
|
|
|
|
if (!CLHL_BuildUserInput(msecstouse, &independantphysics[0]))
|
|
|
|
#endif
|
2005-05-26 12:55:34 +00:00
|
|
|
for (plnum = 0; plnum < cl.splitclients; plnum++)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-05-26 12:55:34 +00:00
|
|
|
// CL_BaseMove (&independantphysics[plnum], plnum, (msecstouse - independantphysics[plnum].msec), wantfps);
|
2009-05-24 10:11:17 +00:00
|
|
|
CL_AdjustAngles (plnum, frametime);
|
|
|
|
IN_Move (mousemovements[plnum], plnum);
|
|
|
|
independantphysics[plnum].forwardmove += mousemovements[plnum][0];
|
|
|
|
independantphysics[plnum].sidemove += mousemovements[plnum][1];
|
|
|
|
independantphysics[plnum].upmove += mousemovements[plnum][2];
|
|
|
|
VectorClear(mousemovements[plnum]);
|
2005-05-26 12:55:34 +00:00
|
|
|
|
|
|
|
for (i=0 ; i<3 ; i++)
|
|
|
|
independantphysics[plnum].angles[i] = ((int)(cl.viewangles[plnum][i]*65536.0/360)&65535);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-05-26 12:55:34 +00:00
|
|
|
if (!independantphysics[plnum].msec)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-05-26 12:55:34 +00:00
|
|
|
CL_BaseMove (&independantphysics[plnum], plnum, (msecstouse - independantphysics[plnum].msec), wantfps);
|
|
|
|
CL_FinishMove(&independantphysics[plnum], msecstouse, plnum);
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-05-26 12:55:34 +00:00
|
|
|
// if we are spectator, try autocam
|
2006-09-17 00:59:22 +00:00
|
|
|
// if (cl.spectator)
|
2008-06-12 20:47:13 +00:00
|
|
|
Cam_Track(plnum, &independantphysics[plnum]);
|
2005-05-27 05:41:07 +00:00
|
|
|
Cam_FinishMove(plnum, &independantphysics[plnum]);
|
2005-05-26 12:55:34 +00:00
|
|
|
independantphysics[plnum].msec = msecstouse;
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-05-24 10:11:17 +00:00
|
|
|
//the main loop isn't allowed to send
|
|
|
|
if (runningindepphys && mainloop)
|
|
|
|
return;
|
|
|
|
|
2008-06-12 20:47:13 +00:00
|
|
|
// if (skipcmd)
|
|
|
|
// return;
|
2005-05-26 12:55:34 +00:00
|
|
|
#ifdef NQPROT
|
2008-06-12 20:47:13 +00:00
|
|
|
if ((!cl.allowsendpacket || cls.state <= ca_connected) && cls.protocol == CP_NETQUAKE)
|
2005-05-26 12:55:34 +00:00
|
|
|
return;
|
2005-06-04 04:20:20 +00:00
|
|
|
#endif
|
|
|
|
|
2008-06-12 20:47:13 +00:00
|
|
|
if (!fullsend && cls.state == ca_active)
|
|
|
|
return; // when we're actually playing we try to match netfps exactly to avoid gameplay problems
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2008-06-12 20:47:13 +00:00
|
|
|
CL_SendDownloadReq(&buf);
|
2005-01-16 02:25:35 +00:00
|
|
|
|
2008-06-12 20:47:13 +00:00
|
|
|
while (clientcmdlist)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2008-06-12 20:47:13 +00:00
|
|
|
next = clientcmdlist->next;
|
|
|
|
if (clientcmdlist->reliable)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2008-11-09 22:29:28 +00:00
|
|
|
if (cls.netchan.message.cursize + 2+strlen(clientcmdlist->command) > cls.netchan.message.maxsize)
|
|
|
|
break;
|
2008-06-12 20:47:13 +00:00
|
|
|
MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
|
|
|
|
MSG_WriteString (&cls.netchan.message, clientcmdlist->command);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-11-09 22:29:28 +00:00
|
|
|
if (buf.cursize + 2+strlen(clientcmdlist->command) <= buf.maxsize)
|
|
|
|
{
|
|
|
|
MSG_WriteByte (&buf, clc_stringcmd);
|
|
|
|
MSG_WriteString (&buf, clientcmdlist->command);
|
|
|
|
}
|
2008-06-12 20:47:13 +00:00
|
|
|
}
|
|
|
|
Con_DPrintf("Sending stringcmd %s\n", clientcmdlist->command);
|
|
|
|
Z_Free(clientcmdlist);
|
|
|
|
clientcmdlist = next;
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2008-06-12 20:47:13 +00:00
|
|
|
// if we're not doing clc_moves and etc, don't continue unless we wrote something previous
|
|
|
|
// or we have something on the reliable buffer (or we're loopback and don't care about flooding)
|
|
|
|
if (!fullsend && cls.netchan.remote_address.type != NA_LOOPBACK && buf.cursize < 1 && cls.netchan.message.cursize < 1)
|
|
|
|
return;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2008-06-12 20:47:13 +00:00
|
|
|
if (fullsend)
|
|
|
|
{
|
|
|
|
switch (cls.protocol)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2008-06-12 20:47:13 +00:00
|
|
|
#ifdef NQPROT
|
|
|
|
case CP_NETQUAKE:
|
|
|
|
msecs -= (double)msecstouse;
|
2004-08-23 00:15:46 +00:00
|
|
|
i = cls.netchan.outgoing_sequence & UPDATE_MASK;
|
2008-06-12 20:47:13 +00:00
|
|
|
cmd = &cl.frames[i].cmd[0];
|
|
|
|
*cmd = independantphysics[0];
|
2005-06-04 04:20:20 +00:00
|
|
|
cl.frames[i].senttime = realtime;
|
2008-06-12 20:47:13 +00:00
|
|
|
cl.frames[i].receivedtime = 0; // nq doesn't allow us to find our own packetloss
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2008-06-12 20:47:13 +00:00
|
|
|
#ifdef CSQC_DAT
|
2008-11-28 20:34:51 +00:00
|
|
|
CSQC_Input_Frame(0, cmd);
|
2005-04-16 16:21:27 +00:00
|
|
|
#endif
|
2008-06-12 20:47:13 +00:00
|
|
|
CLNQ_SendCmd (&buf);
|
|
|
|
break;
|
2004-08-23 00:15:46 +00:00
|
|
|
#endif
|
2008-06-12 20:47:13 +00:00
|
|
|
case CP_QUAKEWORLD:
|
|
|
|
msecs -= (double)msecstouse;
|
|
|
|
dontdrop = CL_SendCmdQW (&buf);
|
|
|
|
break;
|
2004-08-23 00:15:46 +00:00
|
|
|
#ifdef Q2CLIENT
|
2008-06-12 20:47:13 +00:00
|
|
|
case CP_QUAKE2:
|
|
|
|
msecs -= (double)msecstouse;
|
|
|
|
dontdrop = CL_SendCmdQ2 (&buf);
|
|
|
|
break;
|
2004-08-23 00:15:46 +00:00
|
|
|
#endif
|
2008-06-12 20:47:13 +00:00
|
|
|
#ifdef Q3CLIENT
|
|
|
|
case CP_QUAKE3:
|
|
|
|
CLQ3_SendCmd(&independantphysics[0]);
|
|
|
|
memset(&independantphysics[0], 0, sizeof(independantphysics[0]));
|
|
|
|
return; // Q3 does it's own thing
|
2004-08-23 00:15:46 +00:00
|
|
|
#endif
|
2008-06-12 20:47:13 +00:00
|
|
|
default:
|
2009-05-24 10:11:17 +00:00
|
|
|
Host_EndGame("Invalid protocol in CL_SendCmd: %i", cls.protocol);
|
2008-06-12 20:47:13 +00:00
|
|
|
return;
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
i = (cls.netchan.outgoing_sequence) & UPDATE_MASK;
|
|
|
|
cmd = &cl.frames[i].cmd[0];
|
|
|
|
|
|
|
|
if (cls.demorecording)
|
|
|
|
CL_WriteDemoCmd(cmd);
|
|
|
|
|
2008-11-09 22:29:28 +00:00
|
|
|
#ifdef IRCCONNECT
|
|
|
|
if (cls.netchan.remote_address.type == NA_IRC)
|
|
|
|
{
|
|
|
|
if (dropcount >= 2)
|
|
|
|
{
|
|
|
|
dropcount = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// don't count this message when calculating PL
|
|
|
|
cl.frames[i].receivedtime = -3;
|
|
|
|
// drop this message
|
|
|
|
cls.netchan.outgoing_sequence++;
|
|
|
|
dropcount++;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
//shamelessly stolen from fuhquake
|
2009-11-04 21:16:50 +00:00
|
|
|
if (cl_c2spps.ival>0)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-03-20 02:57:11 +00:00
|
|
|
pps_balance += frametime;
|
2004-08-23 00:15:46 +00:00
|
|
|
// never drop more than 2 messages in a row -- that'll cause PL
|
|
|
|
// and don't drop if one of the last two movemessages have an impulse
|
|
|
|
if (pps_balance > 0 || dropcount >= 2 || dontdrop)
|
|
|
|
{
|
|
|
|
float pps;
|
2009-11-04 21:16:50 +00:00
|
|
|
pps = cl_c2spps.ival;
|
2004-08-23 00:15:46 +00:00
|
|
|
if (pps < 10) pps = 10;
|
|
|
|
if (pps > 72) pps = 72;
|
|
|
|
pps_balance -= 1 / pps;
|
|
|
|
// bound pps_balance. FIXME: is there a better way?
|
|
|
|
if (pps_balance > 0.1) pps_balance = 0.1;
|
|
|
|
if (pps_balance < -0.1) pps_balance = -0.1;
|
|
|
|
dropcount = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// don't count this message when calculating PL
|
|
|
|
cl.frames[i].receivedtime = -3;
|
|
|
|
// drop this message
|
|
|
|
cls.netchan.outgoing_sequence++;
|
|
|
|
dropcount++;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pps_balance = 0;
|
|
|
|
dropcount = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// deliver the message
|
|
|
|
//
|
2004-10-19 16:10:14 +00:00
|
|
|
Netchan_Transmit (&cls.netchan, buf.cursize, buf.data, 2500);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (cls.netchan.fatal_error)
|
|
|
|
{
|
|
|
|
cls.netchan.fatal_error = false;
|
|
|
|
cls.netchan.message.overflowed = false;
|
|
|
|
cls.netchan.message.cursize = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *VARGS vahunk(char *format, ...)
|
|
|
|
{
|
|
|
|
va_list argptr;
|
|
|
|
char string[1024];
|
|
|
|
char *ret;
|
|
|
|
|
|
|
|
va_start (argptr, format);
|
2006-03-06 01:41:09 +00:00
|
|
|
vsnprintf (string,sizeof(string)-1, format,argptr);
|
2004-08-23 00:15:46 +00:00
|
|
|
va_end (argptr);
|
|
|
|
|
|
|
|
ret = Hunk_Alloc(strlen(string)+1);
|
|
|
|
strcpy(ret, string);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2007-06-20 00:02:54 +00:00
|
|
|
void CL_SendCvar_f (void)
|
|
|
|
{
|
|
|
|
cvar_t *var;
|
|
|
|
char *val;
|
|
|
|
char *name = Cmd_Argv(1);
|
|
|
|
|
|
|
|
var = Cvar_FindVar(name);
|
|
|
|
if (!var)
|
|
|
|
val = "";
|
|
|
|
else if (var->flags & CVAR_NOUNSAFEEXPAND)
|
|
|
|
val = "";
|
|
|
|
else
|
|
|
|
val = var->string;
|
|
|
|
CL_SendClientCommand(true, "sentcvar %s \"%s\"", name, val);
|
|
|
|
}
|
|
|
|
|
2005-05-13 10:42:48 +00:00
|
|
|
/*
|
|
|
|
============
|
|
|
|
CL_InitInput
|
|
|
|
============
|
|
|
|
*/
|
|
|
|
void CL_InitInput (void)
|
|
|
|
{
|
2010-08-14 00:15:07 +00:00
|
|
|
int sp;
|
2005-05-13 10:42:48 +00:00
|
|
|
#define inputnetworkcvargroup "client networking options"
|
2005-05-19 02:53:03 +00:00
|
|
|
cl.splitclients = 1;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-01-13 16:29:20 +00:00
|
|
|
Cmd_AddCommand("rotate", IN_Rotate_f);
|
2006-02-20 22:33:30 +00:00
|
|
|
Cmd_AddCommand("in_restart", IN_Restart);
|
2007-06-20 00:02:54 +00:00
|
|
|
Cmd_AddCommand("sendcvar", CL_SendCvar_f);
|
2005-01-13 16:29:20 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
Cvar_Register (&cl_nodelta, inputnetworkcvargroup);
|
|
|
|
|
2007-01-06 09:37:33 +00:00
|
|
|
Cvar_Register (&prox_inmenu, inputnetworkcvargroup);
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
Cvar_Register (&cl_c2sImpulseBackup, inputnetworkcvargroup);
|
|
|
|
Cvar_Register (&cl_c2spps, inputnetworkcvargroup);
|
2008-01-22 17:00:05 +00:00
|
|
|
Cvar_Register (&cl_queueimpulses, inputnetworkcvargroup);
|
2004-08-23 00:15:46 +00:00
|
|
|
Cvar_Register (&cl_netfps, inputnetworkcvargroup);
|
2008-06-12 20:47:13 +00:00
|
|
|
Cvar_Register (&cl_sparemsec, inputnetworkcvargroup);
|
2005-04-16 16:21:27 +00:00
|
|
|
|
|
|
|
Cvar_Register (&cl_smartjump, inputnetworkcvargroup);
|
2005-08-03 23:14:59 +00:00
|
|
|
|
|
|
|
Cvar_Register (&cl_prydoncursor, inputnetworkcvargroup);
|
2005-08-11 04:14:33 +00:00
|
|
|
Cvar_Register (&cl_instantrotate, inputnetworkcvargroup);
|
2010-08-14 00:15:07 +00:00
|
|
|
Cvar_Register (&cl_defaultsplitclient, inputnetworkcvargroup);
|
|
|
|
|
|
|
|
for (sp = 0; sp < MAX_SPLITS; sp++)
|
|
|
|
{
|
|
|
|
Cmd_AddRemCommand (vahunk("p%i", sp+1), CL_Split_f);
|
|
|
|
Cmd_AddRemCommand (vahunk("+p%i", sp+1), CL_Split_f);
|
|
|
|
Cmd_AddRemCommand (vahunk("-p%i", sp+1), CL_Split_f);
|
|
|
|
in_mlook.state[sp] = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
Cmd_AddCommand ("+moveup", IN_UpDown);
|
|
|
|
Cmd_AddCommand ("-moveup", IN_UpUp);
|
|
|
|
Cmd_AddCommand ("+movedown", IN_DownDown);
|
|
|
|
Cmd_AddCommand ("-movedown", IN_DownUp);
|
|
|
|
Cmd_AddCommand ("+left", IN_LeftDown);
|
|
|
|
Cmd_AddCommand ("-left", IN_LeftUp);
|
|
|
|
Cmd_AddCommand ("+right", IN_RightDown);
|
|
|
|
Cmd_AddCommand ("-right", IN_RightUp);
|
|
|
|
Cmd_AddCommand ("+forward", IN_ForwardDown);
|
|
|
|
Cmd_AddCommand ("-forward", IN_ForwardUp);
|
|
|
|
Cmd_AddCommand ("+back", IN_BackDown);
|
|
|
|
Cmd_AddCommand ("-back", IN_BackUp);
|
|
|
|
Cmd_AddCommand ("+lookup", IN_LookupDown);
|
|
|
|
Cmd_AddCommand ("-lookup", IN_LookupUp);
|
|
|
|
Cmd_AddCommand ("+lookdown", IN_LookdownDown);
|
|
|
|
Cmd_AddCommand ("-lookdown", IN_LookdownUp);
|
|
|
|
Cmd_AddCommand ("+strafe", IN_StrafeDown);
|
|
|
|
Cmd_AddCommand ("-strafe", IN_StrafeUp);
|
|
|
|
Cmd_AddCommand ("+moveleft", IN_MoveleftDown);
|
|
|
|
Cmd_AddCommand ("-moveleft", IN_MoveleftUp);
|
|
|
|
Cmd_AddCommand ("+moveright", IN_MoverightDown);
|
|
|
|
Cmd_AddCommand ("-moveright", IN_MoverightUp);
|
|
|
|
Cmd_AddCommand ("+speed", IN_SpeedDown);
|
|
|
|
Cmd_AddCommand ("-speed", IN_SpeedUp);
|
|
|
|
Cmd_AddCommand ("+attack", IN_AttackDown);
|
|
|
|
Cmd_AddCommand ("-attack", IN_AttackUp);
|
|
|
|
Cmd_AddCommand ("+use", IN_UseDown);
|
|
|
|
Cmd_AddCommand ("-use", IN_UseUp);
|
|
|
|
Cmd_AddCommand ("+jump", IN_JumpDown);
|
|
|
|
Cmd_AddCommand ("-jump", IN_JumpUp);
|
|
|
|
Cmd_AddCommand ("impulse", IN_Impulse);
|
|
|
|
Cmd_AddCommand ("+klook", IN_KLookDown);
|
|
|
|
Cmd_AddCommand ("-klook", IN_KLookUp);
|
|
|
|
Cmd_AddCommand ("+mlook", IN_MLookDown);
|
|
|
|
Cmd_AddCommand ("-mlooks", IN_MLookUp);
|
|
|
|
|
|
|
|
Cmd_AddCommand ("+button3", IN_Button3Down);
|
|
|
|
Cmd_AddCommand ("-button3", IN_Button3Up);
|
|
|
|
Cmd_AddCommand ("+button4", IN_Button4Down);
|
|
|
|
Cmd_AddCommand ("-button4", IN_Button4Up);
|
|
|
|
Cmd_AddCommand ("+button5", IN_Button5Down);
|
|
|
|
Cmd_AddCommand ("-button5", IN_Button5Up);
|
|
|
|
Cmd_AddCommand ("+button6", IN_Button6Down);
|
|
|
|
Cmd_AddCommand ("-button6", IN_Button6Up);
|
|
|
|
Cmd_AddCommand ("+button7", IN_Button7Down);
|
|
|
|
Cmd_AddCommand ("-button7", IN_Button7Up);
|
|
|
|
Cmd_AddCommand ("+button8", IN_Button8Down);
|
|
|
|
Cmd_AddCommand ("-button8", IN_Button8Up);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|