X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_input.c;h=e528439750445557a09ec2aa5fda98349b9046a2;hb=7e6a65b01c9d2c1fd7be64e14f0202d1bd02eccb;hp=c3fef756b7f1e9dbed37fd16b39efdee15902466;hpb=5fc362d5d72a0aecbd5a64520b105650f8f2d794;p=xonotic%2Fdarkplaces.git

diff --git a/cl_input.c b/cl_input.c
index c3fef756..e5284397 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -77,7 +77,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;
 	}
 
@@ -244,8 +244,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
@@ -385,38 +383,33 @@ void CL_SendMove(usercmd_t *cmd)
 
 	MSG_WriteFloat (&buf, cl.mtime[0]);	// so server can get ping times
 
-	if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
+	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 (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)
+	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
 	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;
@@ -429,28 +422,13 @@ void CL_SendMove(usercmd_t *cmd)
 	MSG_WriteByte (&buf, in_impulse);
 	in_impulse = 0;
 
-	if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
+	// FIXME: should ack latest 3 frames perhaps?
+	if (cl.latestframenum > 0)
 	{
-		// 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
-	{
-		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);
-		}
+		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
@@ -463,8 +441,9 @@ void CL_SendMove(usercmd_t *cmd)
 
 	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);
 	}
 }
 
@@ -522,7 +501,5 @@ void CL_InitInput (void)
 	Cmd_AddCommand ("-button7", IN_Button7Up);
 	Cmd_AddCommand ("+button8", IN_Button8Down);
 	Cmd_AddCommand ("-button8", IN_Button8Up);
-
-	Cvar_RegisterVariable(&cl_nodelta);
 }