X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_input.c;h=fac600f92125eae8aeea7a65c3d4d0b6de6da197;hb=faafbec894094c27f0f50abb1c0b828180523854;hp=661b05a45cdef0590f9f90cb9bfd041f07311ddb;hpb=284dd7a5e650c0edea896734f0179a3fde95defc;p=xonotic%2Fdarkplaces.git

diff --git a/cl_input.c b/cl_input.c
index 661b05a4..fac600f9 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -8,7 +8,7 @@ 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.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -49,7 +49,7 @@ 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;
 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;
@@ -59,8 +59,8 @@ int			in_impulse;
 
 void KeyDown (kbutton_t *b)
 {
-	int		k;
-	char	*c;
+	int k;
+	const char *c;
 
 	c = Cmd_Argv(1);
 	if (c[0])
@@ -77,10 +77,10 @@ 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;
 	}
-	
+
 	if (b->state & 1)
 		return;		// still down
 	b->state |= 1 + 2;	// down + impulse down
@@ -88,9 +88,9 @@ void KeyDown (kbutton_t *b)
 
 void KeyUp (kbutton_t *b)
 {
-	int		k;
-	char	*c;
-	
+	int k;
+	const char *c;
+
 	c = Cmd_Argv(1);
 	if (c[0])
 		k = atoi(c);
@@ -119,10 +119,11 @@ void KeyUp (kbutton_t *b)
 void IN_KLookDown (void) {KeyDown(&in_klook);}
 void IN_KLookUp (void) {KeyUp(&in_klook);}
 void IN_MLookDown (void) {KeyDown(&in_mlook);}
-void IN_MLookUp (void) {
-KeyUp(&in_mlook);
-if ( !(in_mlook.state&1) &&  lookspring.value)
-	V_StartPitchDrift();
+void IN_MLookUp (void)
+{
+	KeyUp(&in_mlook);
+	if ( !(in_mlook.state&1) && lookspring.value)
+		V_StartPitchDrift();
 }
 void IN_UpDown(void) {KeyDown(&in_up);}
 void IN_UpUp(void) {KeyUp(&in_up);}
@@ -154,15 +155,19 @@ void IN_AttackDown(void) {KeyDown(&in_attack);}
 void IN_AttackUp(void) {KeyUp(&in_attack);}
 
 // LordHavoc: added 6 new buttons
-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);}
-
-void IN_UseDown (void) {KeyDown(&in_use);}
-void IN_UseUp (void) {KeyUp(&in_use);}
+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);}
+
 void IN_JumpDown (void) {KeyDown(&in_jump);}
 void IN_JumpUp (void) {KeyUp(&in_jump);}
 
@@ -182,12 +187,12 @@ float CL_KeyState (kbutton_t *key)
 {
 	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)
@@ -218,7 +223,7 @@ float CL_KeyState (kbutton_t *key)
 	}
 
 	key->state &= 1;		// clear impulses
-	
+
 	return val;
 }
 
@@ -239,6 +244,7 @@ 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"};
 
 /*
 ================
@@ -253,9 +259,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))
 	{
@@ -281,6 +287,12 @@ void CL_AdjustAngles (void)
 	cl.viewangles[YAW] = ANGLEMOD(cl.viewangles[YAW]);
 	cl.viewangles[PITCH] = ANGLEMOD(cl.viewangles[PITCH]);
 	cl.viewangles[ROLL] = ANGLEMOD(cl.viewangles[ROLL]);
+	if (cl.viewangles[YAW] >= 180)
+		cl.viewangles[YAW] -= 360;
+	if (cl.viewangles[PITCH] >= 180)
+		cl.viewangles[PITCH] -= 360;
+	if (cl.viewangles[ROLL] >= 180)
+		cl.viewangles[ROLL] -= 360;
 
 	cl.viewangles[PITCH] = bound (in_pitch_min.value, cl.viewangles[PITCH], in_pitch_max.value);
 	cl.viewangles[ROLL] = bound(-50, cl.viewangles[ROLL], 50);
@@ -294,14 +306,14 @@ Send the intended movement message to the server
 ================
 */
 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);
@@ -315,10 +327,10 @@ void CL_BaseMove (usercmd_t *cmd)
 	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
@@ -338,12 +350,12 @@ void CL_BaseMove (usercmd_t *cmd)
 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
 
@@ -352,7 +364,7 @@ void CL_SendMove (usercmd_t *cmd)
 	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
@@ -368,19 +380,17 @@ void CL_SendMove (usercmd_t *cmd)
 
 	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)
+	if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
 	{
 		for (i = 0;i < 3;i++)
 			MSG_WriteFloat (&buf, cl.viewangles[i]);
 	}
-	else if (dpprotocol == DPPROTOCOL_VERSION1)
+	else if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)
 	{
 		for (i=0 ; i<3 ; i++)
 			MSG_WritePreciseAngle (&buf, cl.viewangles[i]);
@@ -391,14 +401,12 @@ void CL_SendMove (usercmd_t *cmd)
 			MSG_WriteAngle (&buf, cl.viewangles[i]);
 	}
 
-    MSG_WriteShort (&buf, forwardmove);
-    MSG_WriteShort (&buf, sidemove);
-    MSG_WriteShort (&buf, upmove);
+	MSG_WriteShort (&buf, forwardmove);
+	MSG_WriteShort (&buf, sidemove);
+	MSG_WriteShort (&buf, upmove);
 
 	forwardmove = sidemove = upmove = 0;
-//
-// send button bits
-//
+	// send button bits
 	bits = 0;
 
 	if ( in_attack.state & 3 )
@@ -416,35 +424,47 @@ void CL_SendMove (usercmd_t *cmd)
 	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)
+	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
 	{
-		MSG_WriteByte (&buf, clc_ackentities);
-		MSG_WriteLong (&buf, i);
+		if (cl.entitydatabase4)
+		{
+			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);
+		}
 	}
 
-//
-// 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();
 	}
 }
 
@@ -481,8 +501,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);
@@ -504,4 +522,7 @@ void CL_InitInput (void)
 	Cmd_AddCommand ("-button7", IN_Button7Up);
 	Cmd_AddCommand ("+button8", IN_Button8Down);
 	Cmd_AddCommand ("-button8", IN_Button8Up);
+
+	Cvar_RegisterVariable(&cl_nodelta);
 }
+