From: Cloudwalk <cloudwalk009@gmail.com>
Date: Mon, 19 Oct 2020 04:38:13 +0000 (-0400)
Subject: Misc tweaks to fitzquake client support
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6ea8d24e82d3ec7b77afaa48e4720a7d744a60ee;p=xonotic%2Fdarkplaces.git

Misc tweaks to fitzquake client support
---

diff --git a/cl_input.c b/cl_input.c
index ffb719b5..91e383d4 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -1859,6 +1859,7 @@ void CL_SendMove(void)
 	case PROTOCOL_DARKPLACES3:
 	case PROTOCOL_DARKPLACES4:
 	case PROTOCOL_DARKPLACES5:
+	case PROTOCOL_FITZQUAKE:
 		break;
 	case PROTOCOL_DARKPLACES6:
 	case PROTOCOL_DARKPLACES7:
diff --git a/cl_parse.c b/cl_parse.c
index 8a6282ad..3bbbe3ac 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -2058,7 +2058,7 @@ void CL_ParseClientdata (void)
 			else
 				cl.mpunchangle[0][i] = MSG_ReadAngle16i(&cl_message);
 		}
-		if (bits & (SU_PUNCHVEC1<<i) && cls.protocol != &protocol_fitzquake)
+		if (cls.protocol != &protocol_fitzquake && bits & (SU_PUNCHVEC1<<i))
 		{
 			if (cls.protocol == &protocol_dpp1 || cls.protocol == &protocol_dpp2 || cls.protocol == &protocol_dpp3 || cls.protocol == &protocol_dpp4)
 				cl.mpunchvector[0][i] = MSG_ReadCoord16i(&cl_message);
diff --git a/cl_protocol_basenq.h b/cl_protocol_basenq.h
index 72c7d4dd..d600769a 100644
--- a/cl_protocol_basenq.h
+++ b/cl_protocol_basenq.h
@@ -87,6 +87,7 @@ static void Netmsg_svc_stufftext (protocol_t *protocol)		// [string] stuffed int
 	else */ switch(cls.protocol->num)
 	{
 		case PROTOCOL_QUAKE:
+		case PROTOCOL_FITZQUAKE:
 			// maybe add other protocols if
 			// so desired, but not DP7
 			strip_pqc = true;