X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_input.c;h=db36a23d997ee09b222a49a04421b8ec8c1f2c02;hp=84687da64629cfd7ac10c0a94bc91d7de3c8ea27;hb=f182457a2c06e0a8791f98aad243018a951a7101;hpb=14a72d7a9ed9d10b3c47e7ff4b4b38664c4ac17a

diff --git a/cl_input.c b/cl_input.c
index 84687da6..db36a23d 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -49,13 +49,15 @@ 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_strafe, in_speed, in_jump, in_attack, in_use;
 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;
 
 int			in_impulse;
 
+extern cvar_t sys_ticrate;
+
 
 void KeyDown (kbutton_t *b)
 {
@@ -77,7 +79,7 @@ void KeyDown (kbutton_t *b)
 		b->down[1] = k;
 	else
 	{
-		Con_Printf ("Three keys down for a button!\n");
+		Con_Print("Three keys down for a button!\n");
 		return;
 	}
 
@@ -154,6 +156,9 @@ 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);}
+
 // LordHavoc: added 6 new buttons
 void IN_Button3Down(void) {KeyDown(&in_button3);}
 void IN_Button3Up(void) {KeyUp(&in_button3);}
@@ -168,8 +173,6 @@ void IN_Button7Up(void) {KeyUp(&in_button7);}
 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);}
 
@@ -246,8 +249,6 @@ cvar_t cl_pitchspeed = {CVAR_SAVE, "cl_pitchspeed","150"};
 
 cvar_t cl_anglespeedkey = {CVAR_SAVE, "cl_anglespeedkey","1.5"};
 
-cvar_t cl_nodelta = {0, "cl_nodelta", "0"};
-
 /*
 ================
 CL_AdjustAngles
@@ -261,9 +262,9 @@ void CL_AdjustAngles (void)
 	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))
 	{
@@ -307,31 +308,35 @@ CL_BaseMove
 Send the intended movement message to the server
 ================
 */
-void CL_BaseMove (usercmd_t *cmd)
+void CL_BaseMove (void)
 {
+	vec3_t temp;
 	if (cls.signon != SIGNONS)
 		return;
 
 	CL_AdjustAngles ();
 
-	memset (cmd, 0, sizeof(*cmd));
+	// PRYDON_CLIENTCURSOR needs to survive basemove resets
+	VectorCopy (cl.cmd.cursor_screen, temp);
+	memset (&cl.cmd, 0, sizeof(cl.cmd));
+	VectorCopy (temp, cl.cmd.cursor_screen);
 
 	if (in_strafe.state & 1)
 	{
-		cmd->sidemove += cl_sidespeed.value * CL_KeyState (&in_right);
-		cmd->sidemove -= cl_sidespeed.value * CL_KeyState (&in_left);
+		cl.cmd.sidemove += cl_sidespeed.value * CL_KeyState (&in_right);
+		cl.cmd.sidemove -= cl_sidespeed.value * CL_KeyState (&in_left);
 	}
 
-	cmd->sidemove += cl_sidespeed.value * CL_KeyState (&in_moveright);
-	cmd->sidemove -= cl_sidespeed.value * CL_KeyState (&in_moveleft);
+	cl.cmd.sidemove += cl_sidespeed.value * CL_KeyState (&in_moveright);
+	cl.cmd.sidemove -= cl_sidespeed.value * CL_KeyState (&in_moveleft);
 
-	cmd->upmove += cl_upspeed.value * CL_KeyState (&in_up);
-	cmd->upmove -= cl_upspeed.value * CL_KeyState (&in_down);
+	cl.cmd.upmove += cl_upspeed.value * CL_KeyState (&in_up);
+	cl.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);
+		cl.cmd.forwardmove += cl_forwardspeed.value * CL_KeyState (&in_forward);
+		cl.cmd.forwardmove -= cl_backspeed.value * CL_KeyState (&in_back);
 	}
 
 //
@@ -339,134 +344,239 @@ void CL_BaseMove (usercmd_t *cmd)
 //
 	if (in_speed.state & 1)
 	{
-		cmd->forwardmove *= cl_movespeedkey.value;
-		cmd->sidemove *= cl_movespeedkey.value;
-		cmd->upmove *= cl_movespeedkey.value;
+		cl.cmd.forwardmove *= cl_movespeedkey.value;
+		cl.cmd.sidemove *= cl_movespeedkey.value;
+		cl.cmd.upmove *= cl_movespeedkey.value;
 	}
 }
 
 
+#include "cl_collision.h"
+
+void CL_UpdatePrydonCursor(void)
+{
+	vec3_t temp, scale;
+
+	if (!cl_prydoncursor.integer)
+		VectorClear(cl.cmd.cursor_screen);
+
+	/*
+	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;
+	}
+	*/
+	cl.cmd.cursor_screen[0] = bound(-1, cl.cmd.cursor_screen[0], 1);
+	cl.cmd.cursor_screen[1] = bound(-1, cl.cmd.cursor_screen[1], 1);
+	cl.cmd.cursor_screen[2] = 1;
+
+	scale[0] = -tan(r_refdef.fov_x * M_PI / 360.0);
+	scale[1] = -tan(r_refdef.fov_y * M_PI / 360.0);
+	scale[2] = 1;
+
+	// trace distance
+	VectorScale(scale, 1000000, scale);
+
+	// FIXME: use something other than renderer variables here
+	// (but they need to match)
+	VectorCopy(r_vieworigin, cl.cmd.cursor_start);
+	VectorSet(temp, cl.cmd.cursor_screen[2] * scale[2], cl.cmd.cursor_screen[0] * scale[0], cl.cmd.cursor_screen[1] * scale[1]);
+	Matrix4x4_Transform(&r_view_matrix, temp, cl.cmd.cursor_end);
+	cl.cmd.cursor_fraction = CL_SelectTraceLine(cl.cmd.cursor_start, cl.cmd.cursor_end, cl.cmd.cursor_impact, cl.cmd.cursor_normal, &cl.cmd.cursor_entitynumber, (chase_active.integer || cl.intermission) ? &cl_entities[cl.playerentity].render : NULL);
+	// makes sparks where cursor is
+	//CL_SparkShower(cl.cmd.cursor_impact, cl.cmd.cursor_normal, 5, 0);
+}
 
 /*
 ==============
 CL_SendMove
 ==============
 */
-void CL_SendMove(usercmd_t *cmd)
+void CL_SendMove(void)
 {
 	int i;
 	int bits;
 	sizebuf_t buf;
 	qbyte data[128];
-	static double lastmovetime;
+	static double lastmovetime = 0;
+#define MOVEAVERAGING 0
+#if MOVEAVERAGING
 	static float forwardmove, sidemove, upmove, total; // accumulation
+#else
+	float forwardmove, sidemove, upmove;
+#endif
+
+	CL_UpdatePrydonCursor();
 
-	forwardmove += cmd->forwardmove;
-	sidemove += cmd->sidemove;
-	upmove += cmd->upmove;
+#if MOVEAVERAGING
+	// accumulate changes between messages
+	forwardmove += cl.cmd.forwardmove;
+	sidemove += cl.cmd.sidemove;
+	upmove += cl.cmd.upmove;
 	total++;
+#endif
 	// LordHavoc: cap outgoing movement messages to sys_ticrate
 	if (!cl.islocalgame && (realtime - lastmovetime < sys_ticrate.value))
 		return;
-	lastmovetime = realtime;
-	// average what has happened during this time
+	lastmovetime = max(lastmovetime + sys_ticrate.value, realtime);
+#if MOVEAVERAGING
+	// average the accumulated changes
 	total = 1.0f / total;
 	forwardmove *= total;
 	sidemove *= total;
 	upmove *= total;
 	total = 0;
+#else
+	// use the latest values
+	forwardmove = cl.cmd.forwardmove;
+	sidemove = cl.cmd.sidemove;
+	upmove = cl.cmd.upmove;
+#endif
 
 	buf.maxsize = 128;
 	buf.cursize = 0;
 	buf.data = data;
 
-	cl.cmd = *cmd;
-
-	// send the movement message
-	MSG_WriteByte (&buf, clc_move);
-
-	MSG_WriteFloat (&buf, cl.mtime[0]);	// so server can get ping times
+	// set button bits
+	// LordHavoc: added 6 new buttons and use and chat buttons, and prydon cursor active button
+	bits = 0;
+	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_button6.state  & 3) bits |=  32;in_button6.state &= ~2;
+	if (in_button7.state  & 3) bits |=  64;in_button7.state &= ~2;
+	if (in_button8.state  & 3) bits |= 128;in_button8.state &= ~2;
+	if (in_use.state      & 3) bits |= 256;in_use.state     &= ~2;
+	if (key_dest != key_game || key_consoleactive) bits |= 512;
+	if (cl_prydoncursor.integer) bits |= 1024;
+	// button bits 11-31 unused currently
+	// rotate/zoom view serverside if PRYDON_CLIENTCURSOR cursor is at edge of screen
+	if (cl.cmd.cursor_screen[0] <= -1) bits |= 8;
+	if (cl.cmd.cursor_screen[0] >=  1) bits |= 16;
+	if (cl.cmd.cursor_screen[1] <= -1) bits |= 32;
+	if (cl.cmd.cursor_screen[1] >=  1) bits |= 64;
 
-	if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
-	{
-		for (i = 0;i < 3;i++)
-			MSG_WriteFloat (&buf, cl.viewangles[i]);
-	}
-	else if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES4)
-	{
-		for (i=0 ; i<3 ; i++)
-			MSG_WritePreciseAngle (&buf, cl.viewangles[i]);
-	}
-	else
+	// always dump the first two messages, because they may contain leftover inputs from the last level
+	if (++cl.movemessages >= 2)
 	{
-		for (i=0 ; i<3 ; i++)
-			MSG_WriteAngle (&buf, cl.viewangles[i]);
+		// send the movement message
+		// PROTOCOL_QUAKE       clc_move = 16 bytes total
+		// PROTOCOL_DARKPLACES1 clc_move = 19 bytes total
+		// PROTOCOL_DARKPLACES2 clc_move = 25 bytes total
+		// PROTOCOL_DARKPLACES3 clc_move = 25 bytes total
+		// PROTOCOL_DARKPLACES4 clc_move = 19 bytes total
+		// PROTOCOL_DARKPLACES5 clc_move = 19 bytes total
+		// PROTOCOL_DARKPLACES6 clc_move = 52 bytes total
+		// 5 bytes
+		MSG_WriteByte (&buf, clc_move);
+		MSG_WriteFloat (&buf, cl.mtime[0]);	// so server can get ping times
+		if (cl.protocol == PROTOCOL_DARKPLACES6)
+		{
+			// 6 bytes
+			for (i = 0;i < 3;i++)
+				MSG_WriteAngle16i (&buf, cl.viewangles[i]);
+			// 6 bytes
+			MSG_WriteCoord16i (&buf, forwardmove);
+			MSG_WriteCoord16i (&buf, sidemove);
+			MSG_WriteCoord16i (&buf, upmove);
+			// 5 bytes
+			MSG_WriteLong (&buf, bits);
+			MSG_WriteByte (&buf, in_impulse);
+			// PRYDON_CLIENTCURSOR
+			// 30 bytes
+			MSG_WriteShort (&buf, cl.cmd.cursor_screen[0] * 32767.0f);
+			MSG_WriteShort (&buf, cl.cmd.cursor_screen[1] * 32767.0f);
+			MSG_WriteFloat (&buf, cl.cmd.cursor_start[0]);
+			MSG_WriteFloat (&buf, cl.cmd.cursor_start[1]);
+			MSG_WriteFloat (&buf, cl.cmd.cursor_start[2]);
+			MSG_WriteFloat (&buf, cl.cmd.cursor_impact[0]);
+			MSG_WriteFloat (&buf, cl.cmd.cursor_impact[1]);
+			MSG_WriteFloat (&buf, cl.cmd.cursor_impact[2]);
+			MSG_WriteShort (&buf, cl.cmd.cursor_entitynumber);
+		}
+		else
+		{
+			if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_NEHAHRAMOVIE)
+			{
+				// 3 bytes
+				for (i = 0;i < 3;i++)
+					MSG_WriteAngle8i (&buf, cl.viewangles[i]);
+			}
+			else if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
+			{
+				// 12 bytes
+				for (i = 0;i < 3;i++)
+					MSG_WriteAngle32f (&buf, cl.viewangles[i]);
+			}
+			else if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)
+			{
+				// 6 bytes
+				for (i = 0;i < 3;i++)
+					MSG_WriteAngle16i (&buf, cl.viewangles[i]);
+			}
+			else
+				Host_Error("CL_SendMove: unknown cl.protocol %i\n", cl.protocol);
+			// 6 bytes
+			MSG_WriteCoord16i (&buf, forwardmove);
+			MSG_WriteCoord16i (&buf, sidemove);
+			MSG_WriteCoord16i (&buf, upmove);
+			// 2 bytes
+			MSG_WriteByte (&buf, bits);
+			MSG_WriteByte (&buf, in_impulse);
+		}
 	}
 
-	MSG_WriteShort (&buf, forwardmove);
-	MSG_WriteShort (&buf, sidemove);
-	MSG_WriteShort (&buf, upmove);
-
+#if MOVEAVERAGING
 	forwardmove = sidemove = upmove = 0;
-	// 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_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_button6.state & 3) bits |=  32;in_button6.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, in_impulse);
+#endif
 	in_impulse = 0;
 
-	if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
-	{
-		// LordHavoc: should we ack this on receipt instead?  would waste net bandwidth though
-		i = EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase);
-		if (i > 0)
-		{
-			MSG_WriteByte(&buf, clc_ackentities);
-			MSG_WriteLong(&buf, i);
-		}
-	}
-	else
+	// ack the last few frame numbers
+	// (redundent to improve handling of client->server packet loss)
+	// for LATESTFRAMENUMS == 3 case this is 15 bytes
+	for (i = 0;i < LATESTFRAMENUMS;i++)
 	{
-		if (cl.entitydatabase4)
+		if (cl.latestframenums[i] > 0)
 		{
-			i = cl.entitydatabase4->ackframenum;
-			if (cl_nodelta.integer)
-				i = -1;
 			if (developer_networkentities.integer >= 1)
-				Con_Printf("send clc_ackentities %i\n", i);
-			MSG_WriteByte(&buf, clc_ackentities);
-			MSG_WriteLong(&buf, i);
+				Con_Printf("send clc_ackframe %i\n", cl.latestframenums[i]);
+			MSG_WriteByte(&buf, clc_ackframe);
+			MSG_WriteLong(&buf, cl.latestframenums[i]);
 		}
 	}
 
+	// PROTOCOL_DARKPLACES6 = 67 bytes per packet
+
 	// deliver the message
 	if (cls.demoplayback)
 		return;
-
-	// always dump the first two messages, because they may contain leftover inputs from the last level
-	if (++cl.movemessages <= 2)
+	// nothing to send
+	if (!buf.cursize)
 		return;
 
 	if (NetConn_SendUnreliableMessage(cls.netcon, &buf) == -1)
 	{
-		Con_Printf("CL_SendMove: lost server connection\n");
+		Con_Print("CL_SendMove: lost server connection\n");
 		CL_Disconnect();
+		Host_ShutdownServer(false);
 	}
 }
 
@@ -503,8 +613,6 @@ void CL_InitInput (void)
 	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);
@@ -513,6 +621,10 @@ void CL_InitInput (void)
 	Cmd_AddCommand ("+mlook", IN_MLookDown);
 	Cmd_AddCommand ("-mlook", IN_MLookUp);
 
+	// LordHavoc: added use button
+	Cmd_AddCommand ("+use", IN_UseDown);
+	Cmd_AddCommand ("-use", IN_UseUp);
+
 	// LordHavoc: added 6 new buttons
 	Cmd_AddCommand ("+button3", IN_Button3Down);
 	Cmd_AddCommand ("-button3", IN_Button3Up);
@@ -526,7 +638,5 @@ void CL_InitInput (void)
 	Cmd_AddCommand ("-button7", IN_Button7Up);
 	Cmd_AddCommand ("+button8", IN_Button8Down);
 	Cmd_AddCommand ("-button8", IN_Button8Up);
-
-	Cvar_RegisterVariable(&cl_nodelta);
 }