From f614822f82d4e123388bf1e2dad72278365af436 Mon Sep 17 00:00:00 2001
From: Sergey Semushin <predelnik@gmail.com>
Date: Sat, 8 Jun 2019 15:11:12 +0300
Subject: [PATCH] Clean up NetSendHiPri.

---
 Source/multi.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/Source/multi.cpp b/Source/multi.cpp
index a440266ab..0e235a501 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -128,12 +128,11 @@ void NetRecvPlrData(TPkt *pkt)
 
 void NetSendHiPri(BYTE *pbMsg, BYTE bLen)
 {
-	unsigned char *v5; // eax
-	BYTE *v6;          // eax
-	int v7;            // eax
-	int v8;            // eax
-	TPkt pkt;          // [esp+Ch] [ebp-204h]
-	int size;          // [esp+20Ch] [ebp-4h]
+	BYTE *hipri_body;
+	BYTE *lowpri_body;
+	DWORD len;
+	TPkt pkt;
+	int size;
 
 	if (pbMsg && bLen) {
 		multi_copy_packet(&sgHiPriBuf, pbMsg, bLen);
@@ -142,13 +141,13 @@ void NetSendHiPri(BYTE *pbMsg, BYTE bLen)
 	if (!gbShouldValidatePackage) {
 		gbShouldValidatePackage = TRUE;
 		NetRecvPlrData(&pkt);
-		size = gdwNormalMsgSize - 19;
-		v5 = multi_recv_packet(&sgHiPriBuf, pkt.body, &size);
-		v6 = multi_recv_packet(&sgLoPriBuf, v5, &size);
-		v7 = sync_all_monsters(v6, size);
-		v8 = gdwNormalMsgSize - v7;
-		pkt.hdr.wLen = v8;
-		if (!SNetSendMessage(-2, &pkt.hdr, v8))
+		size = gdwNormalMsgSize - sizeof(TPktHdr);
+		hipri_body = multi_recv_packet(&sgHiPriBuf, pkt.body, &size);
+		lowpri_body = multi_recv_packet(&sgLoPriBuf, hipri_body, &size);
+		size = sync_all_monsters(lowpri_body, size);
+		len = gdwNormalMsgSize - size;
+		pkt.hdr.wLen = len;
+		if (!SNetSendMessage(-2, &pkt.hdr, len))
 			nthread_terminate_game("SNetSendMessage");
 	}
 }