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.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
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_strafe, in_speed, in_jump, in_attack;
kbutton_t in_up, in_down;
// LordHavoc: added 6 new buttons
kbutton_t in_button3, in_button4, in_button5, in_button6, in_button7, in_button8;
b->down[1] = k;
else
{
- Con_Printf ("Three keys down for a button!\n");
+ Con_Print("Three keys down for a button!\n");
return;
}
void IN_Button8Down(void) {KeyDown(&in_button8);}
void IN_Button8Up(void) {KeyUp(&in_button8);}
-void IN_UseDown (void) {KeyDown(&in_use);}
-void IN_UseUp (void) {KeyUp(&in_use);}
void IN_JumpDown (void) {KeyDown(&in_jump);}
void IN_JumpUp (void) {KeyUp(&in_jump);}
{
float val;
qboolean impulsedown, impulseup, down;
-
+
impulsedown = key->state & 2;
impulseup = key->state & 4;
down = key->state & 1;
val = 0;
-
+
if (impulsedown && !impulseup)
{
if (down)
}
key->state &= 1; // clear impulses
-
+
return val;
}
cvar_t cl_anglespeedkey = {CVAR_SAVE, "cl_anglespeedkey","1.5"};
-
/*
================
CL_AdjustAngles
float up, down;
if (in_speed.state & 1)
- speed = cl.frametime * cl_anglespeedkey.value;
+ speed = host_realframetime * cl_anglespeedkey.value;
else
- speed = cl.frametime;
+ speed = host_realframetime;
if (!(in_strafe.state & 1))
{
================
*/
void CL_BaseMove (usercmd_t *cmd)
-{
+{
if (cls.signon != SIGNONS)
return;
-
+
CL_AdjustAngles ();
-
+
memset (cmd, 0, sizeof(*cmd));
-
+
if (in_strafe.state & 1)
{
cmd->sidemove += cl_sidespeed.value * CL_KeyState (&in_right);
cmd->upmove -= cl_upspeed.value * CL_KeyState (&in_down);
if (! (in_klook.state & 1) )
- {
+ {
cmd->forwardmove += cl_forwardspeed.value * CL_KeyState (&in_forward);
cmd->forwardmove -= cl_backspeed.value * CL_KeyState (&in_back);
- }
+ }
//
// adjust for speed key
CL_SendMove
==============
*/
-void CL_SendMove (usercmd_t *cmd)
+void CL_SendMove(usercmd_t *cmd)
{
- int i;
- int bits;
- sizebuf_t buf;
- qbyte data[128];
+ int i;
+ int bits;
+ sizebuf_t buf;
+ qbyte data[128];
static double lastmovetime;
static float forwardmove, sidemove, upmove, total; // accumulation
upmove += cmd->upmove;
total++;
// LordHavoc: cap outgoing movement messages to sys_ticrate
- if ((cl.maxclients > 1) && (realtime - lastmovetime < sys_ticrate.value))
+ if (!cl.islocalgame && (realtime - lastmovetime < sys_ticrate.value))
return;
lastmovetime = realtime;
// average what has happened during this time
cl.cmd = *cmd;
-//
-// send the movement message
-//
- MSG_WriteByte (&buf, clc_move);
+ // send the movement message
+ MSG_WriteByte (&buf, clc_move);
MSG_WriteFloat (&buf, cl.mtime[0]); // so server can get ping times
- if (dpprotocol == DPPROTOCOL_VERSION2 || dpprotocol == DPPROTOCOL_VERSION3)
+ if (cl.protocol == PROTOCOL_QUAKE)
{
for (i = 0;i < 3;i++)
- MSG_WriteFloat (&buf, cl.viewangles[i]);
+ MSG_WriteAngle8i (&buf, cl.viewangles[i]);
}
- else if (dpprotocol == DPPROTOCOL_VERSION1)
+ else if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
{
- for (i=0 ; i<3 ; i++)
- MSG_WritePreciseAngle (&buf, cl.viewangles[i]);
+ for (i = 0;i < 3;i++)
+ MSG_WriteAngle32f (&buf, cl.viewangles[i]);
}
- else
+ else if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)
{
- for (i=0 ; i<3 ; i++)
- MSG_WriteAngle (&buf, cl.viewangles[i]);
+ for (i = 0;i < 3;i++)
+ MSG_WriteAngle16i (&buf, cl.viewangles[i]);
}
- MSG_WriteShort (&buf, forwardmove);
- MSG_WriteShort (&buf, sidemove);
- MSG_WriteShort (&buf, upmove);
+ MSG_WriteCoord16i (&buf, forwardmove);
+ MSG_WriteCoord16i (&buf, sidemove);
+ MSG_WriteCoord16i (&buf, upmove);
forwardmove = sidemove = upmove = 0;
-//
-// send button bits
-//
+ // send button bits
bits = 0;
- if ( in_attack.state & 3 )
- bits |= 1;
- in_attack.state &= ~2;
-
- if (in_jump.state & 3)
- bits |= 2;
- in_jump.state &= ~2;
// LordHavoc: added 6 new buttons
+ if (in_attack.state & 3) bits |= 1;in_attack.state &= ~2;
+ if (in_jump.state & 3) bits |= 2;in_jump.state &= ~2;
if (in_button3.state & 3) bits |= 4;in_button3.state &= ~2;
if (in_button4.state & 3) bits |= 8;in_button4.state &= ~2;
if (in_button5.state & 3) bits |= 16;in_button5.state &= ~2;
if (in_button7.state & 3) bits |= 64;in_button7.state &= ~2;
if (in_button8.state & 3) bits |= 128;in_button8.state &= ~2;
- MSG_WriteByte (&buf, bits);
+ MSG_WriteByte (&buf, bits);
- MSG_WriteByte (&buf, in_impulse);
+ MSG_WriteByte (&buf, in_impulse);
in_impulse = 0;
- // LordHavoc: should we ack this on receipt instead? would waste net bandwidth though
- i = EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase);
- if (i > 0)
+ // FIXME: should ack latest 3 frames perhaps?
+ if (cl.latestframenum > 0)
{
- MSG_WriteByte (&buf, clc_ackentities);
- MSG_WriteLong (&buf, i);
+ if (developer_networkentities.integer >= 1)
+ Con_Printf("send clc_ackentities %i\n", cl.latestframenum);
+ MSG_WriteByte(&buf, clc_ackentities);
+ MSG_WriteLong(&buf, cl.latestframenum);
}
-//
-// deliver the message
-//
+ // deliver the message
if (cls.demoplayback)
return;
-//
-// always dump the first two messages, because they may contain leftover inputs from the last level
-//
+ // always dump the first two messages, because they may contain leftover inputs from the last level
if (++cl.movemessages <= 2)
return;
- if (NET_SendUnreliableMessage (cls.netcon, &buf) == -1)
+ if (NetConn_SendUnreliableMessage(cls.netcon, &buf) == -1)
{
- Con_Printf ("CL_SendMove: lost server connection\n");
- CL_Disconnect ();
+ Con_Print("CL_SendMove: lost server connection\n");
+ CL_Disconnect();
+ Host_ShutdownServer(false);
}
}
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);
projects / xonotic / darkplaces.git / blobdiff