X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_input.c;h=da3104fdac12ea2f9455a8802c6fde0833cf3561;hb=2f5dfa4708db4112f682b31146a8db1d456a0482;hp=b309f0b4453274ef8c2d73303a7dedf7102626b2;hpb=4988b3a80efbdb3108a0225ed2443d6015111424;p=xonotic%2Fdarkplaces.git

diff --git a/cl_input.c b/cl_input.c
index b309f0b4..da3104fd 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -1829,6 +1829,7 @@ void CL_SendMove(void)
 		break;
 	case PROTOCOL_DARKPLACES6:
 	case PROTOCOL_DARKPLACES7:
+	case PROTOCOL_DARKPLACES8:
 		cl.cmd.predicted = cl_movement.integer != 0;
 		break;
 	default:
@@ -1860,6 +1861,7 @@ void CL_SendMove(void)
 		break;
 	case PROTOCOL_DARKPLACES6:
 	case PROTOCOL_DARKPLACES7:
+	case PROTOCOL_DARKPLACES8:
 		// FIXME: cl.cmd.buttons & 16 is +button5, Nexuiz/Xonotic specific
 		cl.cmd.crouch = (cl.cmd.buttons & 16) != 0;
 		break;
@@ -1938,6 +1940,7 @@ void CL_SendMove(void)
 	// PROTOCOL_DARKPLACES5  clc_move = 19 bytes total
 	// PROTOCOL_DARKPLACES6  clc_move = 52 bytes total
 	// PROTOCOL_DARKPLACES7  clc_move = 56 bytes total per move (can be up to 16 moves)
+	// PROTOCOL_DARKPLACES8  clc_move = 56 bytes total per move (can be up to 16 moves)
 	// PROTOCOL_QUAKEWORLD   clc_move = 34 bytes total (typically, but can reach 43 bytes, or even 49 bytes with roll)
 
 	// set prydon cursor info
@@ -2039,6 +2042,7 @@ void CL_SendMove(void)
 			MSG_WriteByte (&buf, cl.cmd.impulse);
 		case PROTOCOL_DARKPLACES6:
 		case PROTOCOL_DARKPLACES7:
+		case PROTOCOL_DARKPLACES8:
 			// set the maxusercmds variable to limit how many should be sent
 			maxusercmds = bound(1, cl_netrepeatinput.integer + 1, min(3, CL_MAX_USERCMDS));
 			// when movement prediction is off, there's not much point in repeating old input as it will just be ignored
@@ -2163,13 +2167,7 @@ void CL_SendMove(void)
 	in_impulse = 0;
 
 	if (cls.netcon->message.overflowed)
-	{
-		Con_Print("CL_SendMove: lost server connection\n");
-		CL_Disconnect();
-		SV_LockThreadMutex();
-		SV_Shutdown();
-		SV_UnlockThreadMutex();
-	}
+		CL_DisconnectEx(true, "Lost connection to server");
 }
 
 /*