From 150cb875ff00b92f532f42e6f99cca4ce31cd886 Mon Sep 17 00:00:00 2001
From: galaxyhaxz <galaxy-haxz@hotmail.com>
Date: Mon, 20 May 2019 01:04:34 -0500
Subject: [PATCH] On_DLEVEL

---
 Source/msg.cpp | 73 +++++++++++++++++++++++++++-----------------------
 Source/msg.h   |  2 +-
 2 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/Source/msg.cpp b/Source/msg.cpp
index c1e579520..0b32af186 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -1158,48 +1158,55 @@ int ParseCmd(int pnum, TCmd *pCmd)
 		return 0;
 	}
 
-	return On_DLEVEL(pnum, (TCmdPlrInfoHdr *)pCmd);
+	return On_DLEVEL(pnum, pCmd);
 }
 // 66E4A9: using guessed type char sbLastCmd;
 // 67618D: using guessed type char sgbDeltaChunks;
 // 6796E4: using guessed type char gbDeltaSender;
 
-int On_DLEVEL(int pnum, TCmdPlrInfoHdr *pCmd)
+int On_DLEVEL(int pnum, TCmd *pCmd)
 {
-	if ((unsigned char)gbDeltaSender == pnum) {
-		if (sgbRecvCmd != CMD_DLEVEL_END) {
-			if (sgbRecvCmd == pCmd->bCmd) {
-			LABEL_17:
-				memcpy(&sgRecvBuf[pCmd->wOffset], &pCmd[1], pCmd->wBytes);
-				sgdwRecvOffset += pCmd->wBytes;
-				return pCmd->wBytes + 5;
-			}
-			DeltaImportData(sgbRecvCmd, sgdwRecvOffset);
-			if (pCmd->bCmd == CMD_DLEVEL_END) {
-				sgbDeltaChunks = 20;
-				sgbRecvCmd = CMD_DLEVEL_END;
-				return pCmd->wBytes + 5;
-			}
-			sgdwRecvOffset = 0;
-		LABEL_16:
-			sgbRecvCmd = pCmd->bCmd;
-			goto LABEL_17;
+	TCmdPlrInfoHdr *p;
+
+	p = (TCmdPlrInfoHdr *)pCmd;
+
+	if(gbDeltaSender != pnum) {
+		if(p->bCmd == CMD_DLEVEL_END) {
+			gbDeltaSender = pnum;
+			sgbRecvCmd = CMD_DLEVEL_END;
+		} else if(p->bCmd == CMD_DLEVEL_0 && p->wOffset == 0) {
+			gbDeltaSender = pnum;
+			sgbRecvCmd = CMD_DLEVEL_END;
+		} else {
+			return p->wBytes + sizeof(*p);
 		}
-	} else {
-		if (pCmd->bCmd != CMD_DLEVEL_END && (pCmd->bCmd != CMD_DLEVEL_0 || pCmd->wOffset))
-			return pCmd->wBytes + 5;
-		gbDeltaSender = pnum;
-		sgbRecvCmd = CMD_DLEVEL_END;
 	}
-	if (pCmd->bCmd == CMD_DLEVEL_END) {
-		sgbDeltaChunks = 20;
-		return pCmd->wBytes + 5;
-	}
-	if (pCmd->bCmd == CMD_DLEVEL_0 && !pCmd->wOffset) {
-		sgdwRecvOffset = 0;
-		goto LABEL_16;
+	if(sgbRecvCmd == CMD_DLEVEL_END) {
+		if(p->bCmd == CMD_DLEVEL_END) {
+			sgbDeltaChunks = 20;
+			return p->wBytes + sizeof(*p);
+		} else if(p->bCmd == CMD_DLEVEL_0 && p->wOffset == 0) {
+			sgdwRecvOffset = 0;
+			sgbRecvCmd = p->bCmd;
+		} else {
+			return p->wBytes + sizeof(*p);
+		}
+	} else if(sgbRecvCmd != p->bCmd) {
+		DeltaImportData(sgbRecvCmd, sgdwRecvOffset);
+		if(p->bCmd == CMD_DLEVEL_END) {
+			sgbDeltaChunks = 20;
+			sgbRecvCmd = CMD_DLEVEL_END;
+			return p->wBytes + sizeof(*p);
+		} else {
+			sgdwRecvOffset = 0;
+			sgbRecvCmd = p->bCmd;
+		}
 	}
-	return pCmd->wBytes + 5;
+
+	/// ASSERT: assert(p->wOffset == sgdwRecvOffset);
+	memcpy(&sgRecvBuf[p->wOffset], &p[1], p->wBytes);
+	sgdwRecvOffset += p->wBytes;
+	return p->wBytes + sizeof(*p);
 }
 
 void DeltaImportData(BYTE cmd, DWORD recv_offset)
diff --git a/Source/msg.h b/Source/msg.h
index c19d08c08..7bf75c73d 100644
--- a/Source/msg.h
+++ b/Source/msg.h
@@ -53,7 +53,7 @@ void NetSendCmdDamage(BOOL bHiPri, BYTE bPlr, DWORD dwDam);
 void NetSendCmdString(int pmask, const char *pszStr);
 void RemovePlrPortal(int pnum);
 int ParseCmd(int pnum, TCmd *pCmd);
-int On_DLEVEL(int pnum, TCmdPlrInfoHdr *pCmd);
+int On_DLEVEL(int pnum, TCmd *pCmd);
 void DeltaImportData(BYTE cmd, DWORD recv_offset);
 BYTE *DeltaImportItem(BYTE *src, TCmdPItem *dst);
 BYTE *DeltaImportObject(BYTE *src, DObjectStr *dst);