msg.cpp cleanup part #0

3rdParty/Storm/Source/storm.cpp

@@ -230,7 +230,7 @@ bool __cdecl StormDestroy(void) rBool;
 bool __stdcall SFileSetBasePath(char *) rBool;
 void __cdecl SDrawRealizePalette(void) rVoid;
 BOOL __cdecl SVidPlayContinue(void) rBool;
-bool __stdcall SNetGetOwnerTurnsWaiting(int *) rBool;
+BOOL __stdcall SNetGetOwnerTurnsWaiting(DWORD *) rBool;
 void * __stdcall SNetUnregisterEventHandler(int,void (__stdcall*)(struct _SNETEVENT *)) rPVoid;
 void * __stdcall SNetRegisterEventHandler(int,void (__stdcall*)(struct _SNETEVENT *)) rPVoid;
 bool __stdcall SNetSetBasePlayer(int) rBool;

3rdParty/Storm/Source/storm.h

@@ -1292,7 +1292,7 @@ bool __cdecl StormDestroy(void);
 bool __stdcall SFileSetBasePath(char *);
 void __cdecl SDrawRealizePalette(void);
 BOOL __cdecl SVidPlayContinue(void);
-bool __stdcall SNetGetOwnerTurnsWaiting(int *);
+BOOL __stdcall SNetGetOwnerTurnsWaiting(DWORD *);
 void * __stdcall SNetUnregisterEventHandler(int,void (__stdcall*)(struct _SNETEVENT *));
 void * __stdcall SNetRegisterEventHandler(int,void (__stdcall*)(struct _SNETEVENT *));
 bool __stdcall SNetSetBasePlayer(int);

Source/items.cpp

@@ -5512,7 +5512,7 @@ void __fastcall CreateMagicItem(int x, int y, int imisc, int icurs, int sendmsg,
 	}
 }
 
-bool __fastcall GetItemRecord(int dwSeed, int CI, int indx)
+bool __fastcall GetItemRecord(int dwSeed, WORD CI, int indx)
 {
 	int v3; // edi
 	int *v4; // ebx
@@ -5569,7 +5569,7 @@ void __fastcall NextItemRecord(int i)
 	}
 }
 
-void __fastcall SetItemRecord(int dwSeed, int CI, int indx)
+void __fastcall SetItemRecord(int dwSeed, WORD CI, int indx)
 {
 	int i; // ecx
 
@@ -5583,7 +5583,7 @@ void __fastcall SetItemRecord(int dwSeed, int CI, int indx)
 	}
 }
 
-void __fastcall PutItemRecord(int seed, int ci, int index)
+void __fastcall PutItemRecord(int seed, WORD ci, int index)
 {
 	int v3; // edi
 	int *v4; // ebx

Source/items.h

@@ -120,10 +120,10 @@ void __cdecl RecalcStoreStats();
 int __cdecl ItemNoFlippy();
 void __fastcall CreateSpellBook(int x, int y, int ispell, bool sendmsg, int delta);
 void __fastcall CreateMagicItem(int x, int y, int imisc, int icurs, int sendmsg, int delta);
-bool __fastcall GetItemRecord(int dwSeed, int CI, int indx);
+bool __fastcall GetItemRecord(int dwSeed, WORD CI, int indx);
 void __fastcall NextItemRecord(int i);
-void __fastcall SetItemRecord(int dwSeed, int CI, int indx);
-void __fastcall PutItemRecord(int seed, int ci, int index);
+void __fastcall SetItemRecord(int dwSeed, WORD CI, int indx);
+void __fastcall PutItemRecord(int seed, WORD ci, int index);
 
 /* rdata */
 

Source/msg.cpp

@@ -2,36 +2,24 @@
 
 #include "../types.h"
 
-int sgdwOwnerWait; // weak
-int msg_cpp_init_value; // weak
-int sgdwRecvOffset; // idb
-int sgnCurrMegaPlayer; // weak
-DLevel sgLevels[NUMLEVELS];
-char sbLastCmd; // weak
-TMegaPkt *sgpCurrPkt;
-char sgRecvBuf[4722];
-unsigned char sgbRecvCmd; // idb
-LocalLevel sgLocals[NUMLEVELS];
-DJunk sgJunk;
-TMegaPkt *sgpMegaPkt;
-char sgbDeltaChanged; // weak
-char sgbDeltaChunks; // weak
-int deltaload; // weak
-char gbBufferMsgs; // weak
-int dword_676198; // weak
-int msg_err_timer; // weak
-
-const int msg_inf = 0x7F800000; // weak
-
-struct msg_cpp_init
-{
-	msg_cpp_init()
-	{
-		msg_cpp_init_value = msg_inf;
-	}
-} _msg_cpp_init;
-// 47F14C: using guessed type int msg_inf;
-// 65AB1C: using guessed type int msg_cpp_init_value;
+static DWORD sgdwOwnerWait;
+static DWORD sgdwRecvOffset;
+static int sgnCurrMegaPlayer;
+static DLevel sgLevels[NUMLEVELS];
+static BYTE sbLastCmd;
+static TMegaPkt *sgpCurrPkt;
+static char sgRecvBuf[sizeof(DLevel)+1];
+static BYTE sgbRecvCmd;
+static LocalLevel sgLocals[NUMLEVELS];
+static DJunk sgJunk;
+static TMegaPkt *sgpMegaPkt;
+static BYTE sgbDeltaChanged;
+static BYTE sgbDeltaChunks;
+int deltaload;
+BYTE gbBufferMsgs;
+int pkt_counter;
+
+static float msg_cpp_init_value = INFINITY;
 
 void __fastcall msg_send_drop_pkt(int pnum, int reason)
 {
@@ -43,9 +31,9 @@ void __fastcall msg_send_drop_pkt(int pnum, int reason)
 	msg_send_packet(pnum, &cmd, 6);
 }
 
-void __fastcall msg_send_packet(int pnum, void *packet, int dwSize)
+void __fastcall msg_send_packet(int pnum, const void *packet, DWORD dwSize)
 {
-	void *v3; // edi
+	const void *v3; // edi
 	TMegaPkt *v4; // eax
 	TFakeCmdPlr cmd; // [esp+Ah] [ebp-2h]
 
@@ -89,7 +77,7 @@ TMegaPkt *__cdecl msg_get_next_packet()
 	return result;
 }
 
-int __cdecl msg_wait_resync()
+BOOL __cdecl msg_wait_resync()
 {
 	int v0; // eax
 
@@ -145,7 +133,7 @@ int __cdecl msg_wait_for_turns()
 	//int v0; // eax
 	//int v2; // eax
 	int recieved; // [esp+0h] [ebp-8h]
-	int turns; // [esp+4h] [ebp-4h]
+	DWORD turns; // [esp+4h] [ebp-4h]
 
 	if ( !sgbDeltaChunks )
 	{
@@ -247,7 +235,7 @@ void __fastcall DeltaExportData(int pnum)
 	void *v5; // eax
 	void *v6; // eax
 	int v7; // eax
-	char *v8; // eax
+	void *v8; // eax
 	int v9; // eax
 	int player_num; // [esp+0h] [ebp-Ch]
 	int v11; // [esp+4h] [ebp-8h]
@@ -265,13 +253,13 @@ void __fastcall DeltaExportData(int pnum)
 			v4 = DeltaExportItem(v3, &v2[-2794]);
 			v5 = DeltaExportObject(v4, v2);
 			v6 = DeltaExportMonster(v5, &v2[127]);
-			v7 = msg_comp_level(v1, (int)v6);
+			v7 = msg_comp_level(v1, v6);
 			dthread_send_delta(player_num, (_BYTE)v11++ + CMD_DLEVEL_0, v1, v7);
 			v2 += 4721;
 		}
 		while ( (signed int)v2 < (signed int)&sgLevels[NUMLEVELS].object );
-		v8 = DeltaExportJunk((char *)v3);
-		v9 = msg_comp_level(v1, (int)v8);
+		v8 = DeltaExportJunk(v3);
+		v9 = msg_comp_level(v1, v8);
 		dthread_send_delta(player_num, CMD_DLEVEL_JUNK, v1, v9);
 		mem_free_dbg(v1);
 	}
@@ -343,7 +331,7 @@ void *__fastcall DeltaExportMonster(void *dst, void *src)
 	return v3;
 }
 
-char *__fastcall DeltaExportJunk(char *a1)
+void *__fastcall DeltaExportJunk(void *dst)
 {
 	char *v1; // ebx
 	DJunk *v2; // edi
@@ -351,7 +339,7 @@ char *__fastcall DeltaExportJunk(char *a1)
 	unsigned char *v4; // edi
 	int *v5; // ebp
 
-	v1 = a1;
+	v1 = (char*)dst;
 	v2 = &sgJunk;
 	v3 = sgJunk.quests;
 	do
@@ -388,15 +376,15 @@ char *__fastcall DeltaExportJunk(char *a1)
 	return v1;
 }
 
-int __fastcall msg_comp_level(char *buffer, int size)
+int __fastcall msg_comp_level(char *begin, void *end)
 {
 	char *v2; // esi
 	int v3; // edi
 	int v4; // eax
 
-	v2 = buffer;
-	v3 = size - (_DWORD)buffer - 1;
-	v4 = PkwareCompress(buffer + 1, v3);
+	v2 = begin;
+	v3 = (char*)end - begin - 1;
+	v4 = PkwareCompress(begin + 1, v3);
 	*v2 = v3 != v4;
 	return v4 + 1;
 }
@@ -412,7 +400,7 @@ void __cdecl delta_init()
 // 67618C: using guessed type char sgbDeltaChanged;
 // 676190: using guessed type int deltaload;
 
-void __fastcall delta_kill_monster(int mi, unsigned char x, unsigned char y, unsigned char bLevel)
+void __fastcall delta_kill_monster(int mi, BYTE x, BYTE y, BYTE bLevel)
 {
 	DMonsterStr *v4; // eax
 	char v5; // cl
@@ -431,7 +419,7 @@ void __fastcall delta_kill_monster(int mi, unsigned char x, unsigned char y, uns
 // 67618C: using guessed type char sgbDeltaChanged;
 // 679660: using guessed type char gbMaxPlayers;
 
-void __fastcall delta_monster_hp(int mi, int hp, unsigned char bLevel)
+void __fastcall delta_monster_hp(int mi, int hp, BYTE bLevel)
 {
 	DMonsterStr *v3; // eax
 
@@ -446,7 +434,7 @@ void __fastcall delta_monster_hp(int mi, int hp, unsigned char bLevel)
 // 67618C: using guessed type char sgbDeltaChanged;
 // 679660: using guessed type char gbMaxPlayers;
 
-void __fastcall delta_sync_monster(TCmdLocParam1 *packet, char level)
+void __fastcall delta_sync_monster(TCmdLocParam1 *packet, BYTE level)
 {
 	DMonsterStr *v2; // eax
 	char v3; // dl
@@ -468,7 +456,7 @@ void __fastcall delta_sync_monster(TCmdLocParam1 *packet, char level)
 // 67618C: using guessed type char sgbDeltaChanged;
 // 679660: using guessed type char gbMaxPlayers;
 
-void __fastcall delta_sync_golem(TCmdGolem *pG, int pnum, int bLevel)
+void __fastcall delta_sync_golem(TCmdGolem *pG, int pnum, BYTE bLevel)
 {
 	DMonsterStr *v3; // eax
 	char v4; // dl
@@ -489,7 +477,7 @@ void __fastcall delta_sync_golem(TCmdGolem *pG, int pnum, int bLevel)
 // 67618C: using guessed type char sgbDeltaChanged;
 // 679660: using guessed type char gbMaxPlayers;
 
-void __fastcall delta_leave_sync(unsigned char bLevel)
+void __fastcall delta_leave_sync(BYTE bLevel)
 {
 	unsigned char v1; // bl
 	bool v2; // zf
@@ -535,12 +523,12 @@ void __fastcall delta_leave_sync(unsigned char bLevel)
 // 67618C: using guessed type char sgbDeltaChanged;
 // 679660: using guessed type char gbMaxPlayers;
 
-bool __fastcall delta_portal_inited(int i)
+BOOL __fastcall delta_portal_inited(int i)
 {
 	return sgJunk.portal[i].x == LOBYTE(-1);
 }
 
-bool __fastcall delta_quest_inited(int i)
+BOOL __fastcall delta_quest_inited(int i)
 {
 	return sgJunk.quests[i].qstate != LOBYTE(-1);
 }
@@ -907,7 +895,7 @@ void __cdecl DeltaLoadLevel()
 // 676190: using guessed type int deltaload;
 // 679660: using guessed type char gbMaxPlayers;
 
-void __fastcall NetSendCmd(BOOL bHiPri, unsigned char bCmd)
+void __fastcall NetSendCmd(BOOL bHiPri, BYTE bCmd)
 {
 	TCmd cmd; // [esp+3h] [ebp-1h]
 
@@ -918,7 +906,7 @@ void __fastcall NetSendCmd(BOOL bHiPri, unsigned char bCmd)
 		NetSendLoPri((unsigned char *)&cmd, 1u);
 }
 
-void __fastcall NetSendCmdGolem(unsigned char mx, unsigned char my, unsigned char dir, unsigned char menemy, int hp, int cl)
+void __fastcall NetSendCmdGolem(BYTE mx, BYTE my, BYTE dir, BYTE menemy, int hp, int cl)
 {
 	TCmdGolem cmd; // [esp+0h] [ebp-Ch]
 
@@ -932,7 +920,7 @@ void __fastcall NetSendCmdGolem(unsigned char mx, unsigned char my, unsigned cha
 	NetSendLoPri((unsigned char *)&cmd, 0xAu);
 }
 
-void __fastcall NetSendCmdLoc(BOOL bHiPri, unsigned char bCmd, unsigned char x, unsigned char y)
+void __fastcall NetSendCmdLoc(BOOL bHiPri, BYTE bCmd, BYTE x, BYTE y)
 {
 	TCmdLoc cmd; // [esp+1h] [ebp-3h]
 
@@ -945,7 +933,7 @@ void __fastcall NetSendCmdLoc(BOOL bHiPri, unsigned char bCmd, unsigned char x,
 		NetSendLoPri((unsigned char *)&cmd, 3u);
 }
 
-void __fastcall NetSendCmdLocParam1(BOOL bHiPri, unsigned char bCmd, unsigned char x, unsigned char y, unsigned short wParam1)
+void __fastcall NetSendCmdLocParam1(BOOL bHiPri, BYTE bCmd, BYTE x, BYTE y, WORD wParam1)
 {
 	TCmdLocParam1 cmd; // [esp+0h] [ebp-8h]
 
@@ -959,7 +947,7 @@ void __fastcall NetSendCmdLocParam1(BOOL bHiPri, unsigned char bCmd, unsigned ch
 		NetSendLoPri((unsigned char *)&cmd, 5u);
 }
 
-void __fastcall NetSendCmdLocParam2(BOOL bHiPri, unsigned char bCmd, unsigned char x, unsigned char y, unsigned short wParam1, unsigned short wParam2)
+void __fastcall NetSendCmdLocParam2(BOOL bHiPri, BYTE bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2)
 {
 	TCmdLocParam2 cmd; // [esp+0h] [ebp-8h]
 
@@ -974,7 +962,7 @@ void __fastcall NetSendCmdLocParam2(BOOL bHiPri, unsigned char bCmd, unsigned ch
 		NetSendLoPri((unsigned char *)&cmd, 7u);
 }
 
-void __fastcall NetSendCmdLocParam3(BOOL bHiPri, unsigned char bCmd, unsigned char x, unsigned char y, unsigned short wParam1, unsigned short wParam2, unsigned short wParam3)
+void __fastcall NetSendCmdLocParam3(BOOL bHiPri, BYTE bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2, WORD wParam3)
 {
 	TCmdLocParam3 cmd; // [esp+0h] [ebp-Ch]
 
@@ -990,7 +978,7 @@ void __fastcall NetSendCmdLocParam3(BOOL bHiPri, unsigned char bCmd, unsigned ch
 		NetSendLoPri((unsigned char *)&cmd, 9u);
 }
 
-void __fastcall NetSendCmdParam1(BOOL bHiPri, unsigned char bCmd, unsigned short wParam1)
+void __fastcall NetSendCmdParam1(BOOL bHiPri, BYTE bCmd, WORD wParam1)
 {
 	TCmdParam1 cmd; // [esp+1h] [ebp-3h]
 
@@ -1002,7 +990,7 @@ void __fastcall NetSendCmdParam1(BOOL bHiPri, unsigned char bCmd, unsigned short
 		NetSendLoPri((unsigned char *)&cmd, 3u);
 }
 
-void __fastcall NetSendCmdParam2(BOOL bHiPri, unsigned char bCmd, unsigned short wParam1, unsigned short wParam2)
+void __fastcall NetSendCmdParam2(BOOL bHiPri, BYTE bCmd, WORD wParam1, WORD wParam2)
 {
 	TCmdParam2 cmd; // [esp+0h] [ebp-8h]
 
@@ -1015,7 +1003,7 @@ void __fastcall NetSendCmdParam2(BOOL bHiPri, unsigned char bCmd, unsigned short
 		NetSendLoPri((unsigned char *)&cmd, 5u);
 }
 
-void __fastcall NetSendCmdParam3(BOOL bHiPri, unsigned char bCmd, unsigned short wParam1, unsigned short wParam2, unsigned short wParam3)
+void __fastcall NetSendCmdParam3(BOOL bHiPri, BYTE bCmd, WORD wParam1, WORD wParam2, WORD wParam3)
 {
 	TCmdParam3 cmd; // [esp+0h] [ebp-8h]
 
@@ -1029,7 +1017,7 @@ void __fastcall NetSendCmdParam3(BOOL bHiPri, unsigned char bCmd, unsigned short
 		NetSendLoPri((unsigned char *)&cmd, 7u);
 }
 
-void __fastcall NetSendCmdQuest(BOOL bHiPri, unsigned char q)
+void __fastcall NetSendCmdQuest(BOOL bHiPri, BYTE q)
 {
 	int v2; // eax
 	char v3; // dl
@@ -1049,7 +1037,7 @@ void __fastcall NetSendCmdQuest(BOOL bHiPri, unsigned char q)
 		NetSendLoPri((unsigned char *)&cmd, 5u);
 }
 
-void __fastcall NetSendCmdGItem(BOOL bHiPri, unsigned char bCmd, unsigned char mast, unsigned char pnum, int ii)
+void __fastcall NetSendCmdGItem(BOOL bHiPri, BYTE bCmd, BYTE mast, BYTE pnum, int ii)
 {
 	int v5; // eax
 	bool v6; // zf
@@ -1109,7 +1097,7 @@ void __fastcall NetSendCmdGItem(BOOL bHiPri, unsigned char bCmd, unsigned char m
 		NetSendLoPri((unsigned char *)&cmd, 0x1Eu);
 }
 
-void __fastcall NetSendCmdGItem2(BOOL usonly, unsigned char bCmd, unsigned char mast, unsigned char pnum, struct TCmdGItem *p)
+void __fastcall NetSendCmdGItem2(BOOL usonly, BYTE bCmd, BYTE mast, BYTE pnum, struct TCmdGItem *p)
 {
 	unsigned char v5; // bl
 	int v7; // eax
@@ -1139,7 +1127,7 @@ void __fastcall NetSendCmdGItem2(BOOL usonly, unsigned char bCmd, unsigned char
 	multi_msg_add(&cmd.bCmd, 0x1Eu);
 }
 
-bool __fastcall NetSendCmdReq2(unsigned char bCmd, unsigned char mast, unsigned char pnum, struct TCmdGItem *p)
+bool __fastcall NetSendCmdReq2(BYTE bCmd, BYTE mast, BYTE pnum, struct TCmdGItem *p)
 {
 	unsigned char v4; // bl
 	int v5; // eax
@@ -1175,7 +1163,7 @@ void __fastcall NetSendCmdExtra(struct TCmdGItem *p)
 	NetSendHiPri((unsigned char *)&cmd, 0x1Eu);
 }
 
-void __fastcall NetSendCmdPItem(BOOL bHiPri, unsigned char bCmd, unsigned char x, unsigned char y)
+void __fastcall NetSendCmdPItem(BOOL bHiPri, BYTE bCmd, BYTE x, BYTE y)
 {
 	int v4; // eax
 	short *v5; // edx
@@ -1232,7 +1220,7 @@ void __fastcall NetSendCmdPItem(BOOL bHiPri, unsigned char bCmd, unsigned char x
 		NetSendLoPri((unsigned char *)&cmd, 0x16u);
 }
 
-void __fastcall NetSendCmdChItem(BOOL bHiPri, unsigned char bLoc)
+void __fastcall NetSendCmdChItem(BOOL bHiPri, BYTE bLoc)
 {
 	short v2; // dx
 	char v3; // al
@@ -1252,7 +1240,7 @@ void __fastcall NetSendCmdChItem(BOOL bHiPri, unsigned char bLoc)
 		NetSendLoPri((unsigned char *)&cmd, 0xBu);
 }
 
-void __fastcall NetSendCmdDelItem(BOOL bHiPri, unsigned char bLoc)
+void __fastcall NetSendCmdDelItem(BOOL bHiPri, BYTE bLoc)
 {
 	TCmdDelItem cmd; // [esp+2h] [ebp-2h]
 
@@ -1321,7 +1309,7 @@ void __fastcall NetSendCmdDItem(BOOL bHiPri, int ii)
 		NetSendLoPri((unsigned char *)&cmd, 0x16u);
 }
 
-void __fastcall NetSendCmdDamage(BOOL bHiPri, unsigned char bPlr, unsigned int dwDam)
+void __fastcall NetSendCmdDamage(BOOL bHiPri, BYTE bPlr, DWORD dwDam)
 {
 	TCmdDamage cmd; // [esp+0h] [ebp-8h]
 
@@ -1334,7 +1322,7 @@ void __fastcall NetSendCmdDamage(BOOL bHiPri, unsigned char bPlr, unsigned int d
 		NetSendLoPri((unsigned char *)&cmd, 6u);
 }
 
-void __fastcall NetSendCmdString(int a1, const char *pszStr)
+void __fastcall NetSendCmdString(int player_mask, const char *pszStr)
 {
 	const char *v2; // esi
 	int v3; // edi
@@ -1342,7 +1330,7 @@ void __fastcall NetSendCmdString(int a1, const char *pszStr)
 	TCmdString cmd; // [esp+Ch] [ebp-54h]
 
 	v2 = pszStr;
-	v3 = a1;
+	v3 = player_mask;
 	dwStrLen = strlen(pszStr);
 	cmd.bCmd = CMD_STRING;
 	strcpy(cmd.str, v2);
@@ -1417,13 +1405,13 @@ int __fastcall ParseCmd(int pnum, TCmd *pCmd)
 		case CMD_RATTACKPID:
 			return On_RATTACKPID((struct TCmdParam1 *)v3, pnum);
 		case CMD_SPELLID:
-			return On_SPELLID((struct TCmdLocParam2 *)v3, pnum);
+			return On_SPELLID((struct TCmdParam3 *)v3, pnum);
 		case CMD_SPELLPID:
-			return On_SPELLPID((struct TCmdLocParam2 *)v3, pnum);
+			return On_SPELLPID((struct TCmdParam3 *)v3, pnum);
 		case CMD_TSPELLID:
-			return On_TSPELLID((struct TCmdLocParam2 *)v3, pnum);
+			return On_TSPELLID((struct TCmdParam3 *)v3, pnum);
 		case CMD_TSPELLPID:
-			return On_TSPELLPID((struct TCmdLocParam2 *)v3, pnum);
+			return On_TSPELLPID((struct TCmdParam3 *)v3, pnum);
 		case CMD_RESURRECT:
 			return On_RESURRECT((struct TCmdParam1 *)v3, pnum);
 		case CMD_OPOBJT:
@@ -1443,18 +1431,18 @@ int __fastcall ParseCmd(int pnum, TCmd *pCmd)
 			return On_CHEAT_SPELL_LEVEL(v3, pnum);
 #else
 		case CMD_CHEAT_EXPERIENCE:
-			return On_DEBUG();
+			return On_DEBUG(v3);
 		case CMD_CHEAT_SPELL_LEVEL:
-			return On_DEBUG();
+			return On_DEBUG(v3);
 #endif
 		case CMD_DEBUG:
-			return On_DEBUG();
+			return On_DEBUG(v3);
 		case CMD_SYNCDATA:
 			return On_SYNCDATA(v3, pnum);
 		case CMD_MONSTDEATH:
 			return On_MONSTDEATH((struct TCmdLocParam1 *)v3, pnum);
 		case CMD_MONSTDAMAGE:
-			return On_MONSTDAMAGE((struct TCmdLocParam1 *)v3, pnum);
+			return On_MONSTDAMAGE((struct TCmdParam2 *)v3, pnum);
 		case CMD_PLRDEAD:
 			return On_PLRDEAD((struct TCmdParam1 *)v3, pnum);
 		case CMD_REQUESTGITEM:
@@ -1492,7 +1480,7 @@ int __fastcall ParseCmd(int pnum, TCmd *pCmd)
 		case CMD_SATTACKXY:
 			return On_SATTACKXY((struct TCmdLoc *)v3, pnum);
 		case CMD_ACTIVATEPORTAL:
-			return On_ACTIVATEPORTAL((DJunk *)v3, pnum);
+			return On_ACTIVATEPORTAL((struct TCmdLocParam3 *)v3, pnum);
 		case CMD_DEACTIVATEPORTAL:
 			return On_DEACTIVATEPORTAL(v3, pnum);
 		case CMD_HEALOTHER:
@@ -1520,15 +1508,15 @@ int __fastcall ParseCmd(int pnum, TCmd *pCmd)
 		case CMD_SYNCQUEST:
 			return On_SYNCQUEST((struct TCmdQuest *)v3, pnum);
 		case CMD_ENDSHIELD:
-			return On_ENDSHIELD((int)v3, pnum);
+			return On_ENDSHIELD(v3, pnum);
 		case CMD_AWAKEGOLEM:
 			return On_AWAKEGOLEM((struct TCmdGolem *)v3, pnum);
 		case CMD_NOVA:
 			return On_NOVA((struct TCmdLoc *)v3, pnum);
 		case CMD_SETSHIELD:
-			return On_SETSHIELD((int)v3, pnum);
+			return On_SETSHIELD(v3, pnum);
 		case CMD_REMSHIELD:
-			return On_REMSHIELD((int)v3, pnum);
+			return On_REMSHIELD(v3, pnum);
 		default:
 			if ( v5 < CMD_DLEVEL_0 || v5 > CMD_DLEVEL_END )
 			{
@@ -1587,7 +1575,7 @@ LABEL_100:
 // 67618D: using guessed type char sgbDeltaChunks;
 // 6796E4: using guessed type char gbDeltaSender;
 
-void __fastcall DeltaImportData(unsigned char cmd, int recv_offset)
+void __fastcall DeltaImportData(BYTE cmd, DWORD recv_offset)
 {
 	unsigned char v2; // bl
 	int v3; // esi
@@ -1599,7 +1587,7 @@ void __fastcall DeltaImportData(unsigned char cmd, int recv_offset)
 		PkwareDecompress(&sgRecvBuf[1], recv_offset, 4721);
 	if ( v2 == CMD_DLEVEL_JUNK )
 	{
-		DeltaImportJunk((int)&sgRecvBuf[1]);
+		DeltaImportJunk(&sgRecvBuf[1]);
 	}
 	else if ( v2 < CMD_DLEVEL_0 || v2 > CMD_DLEVEL_16 )
 	{
@@ -1683,7 +1671,7 @@ void *__fastcall DeltaImportMonster(void *src, void *dst)
 	return v3;
 }
 
-char __fastcall DeltaImportJunk(int a1)
+void __fastcall DeltaImportJunk(void *src)
 {
 	_BYTE *v1; // ebx
 	int v2; // edi
@@ -1693,7 +1681,7 @@ char __fastcall DeltaImportJunk(int a1)
 	unsigned char *v6; // edi
 	int *v7; // ebp
 
-	v1 = (_BYTE *)a1;
+	v1 = (_BYTE *)src;
 	v2 = 0;
 	v3 = &sgJunk;
 	do
@@ -1739,7 +1727,6 @@ char __fastcall DeltaImportJunk(int a1)
 		v6 += 24;
 	}
 	while ( (signed int)v7 < (signed int)&questlist[16]._qflags );
-	return result;
 }
 
 int __fastcall On_SYNCDATA(void *packet, int pnum)
@@ -1864,8 +1851,9 @@ int __fastcall On_SBSPELL(struct TCmdParam1 *pCmd, int pnum)
 }
 // 676194: using guessed type char gbBufferMsgs;
 
-void msg_errorf(char *pszFmt, ...)
+void msg_errorf(const char *pszFmt, ...)
 {
+	static DWORD msg_err_timer;
 	DWORD v1; // eax
 	char v2[256]; // [esp+0h] [ebp-100h]
 	va_list va; // [esp+10Ch] [ebp+Ch]
@@ -1880,7 +1868,6 @@ void msg_errorf(char *pszFmt, ...)
 	}
 	va_end(va);
 }
-// 67619C: using guessed type int msg_err_timer;
 
 int __fastcall On_GOTOGETITEM(struct TCmdLocParam1 *pCmd, int pnum)
 {
@@ -1949,7 +1936,7 @@ int __fastcall On_REQUESTGITEM(struct TCmdGItem *pCmd, int pnum)
 }
 // 676194: using guessed type char gbBufferMsgs;
 
-bool __fastcall i_own_level(int nReqLevel)
+BOOL __fastcall i_own_level(int nReqLevel)
 {
 	int v1; // edx
 	unsigned char *v2; // eax
@@ -2040,7 +2027,7 @@ int __fastcall On_GETITEM(struct TCmdGItem *pCmd, int pnum)
 }
 // 676194: using guessed type char gbBufferMsgs;
 
-bool __fastcall delta_get_item(struct TCmdGItem *pI, unsigned char bLevel)
+BOOL __fastcall delta_get_item(struct TCmdGItem *pI, BYTE bLevel)
 {
 	struct TCmdGItem *v2; // esi
 	signed int v3; // ecx
@@ -2334,7 +2321,7 @@ int __fastcall On_PUTITEM(struct TCmdPItem *pCmd, int pnum)
 }
 // 676194: using guessed type char gbBufferMsgs;
 
-void __fastcall delta_put_item(struct TCmdPItem *pI, int x, int y, unsigned char bLevel)
+void __fastcall delta_put_item(struct TCmdPItem *pI, int x, int y, BYTE bLevel)
 {
 	struct TCmdPItem *v4; // ebx
 	int v5; // eax
@@ -2802,9 +2789,9 @@ int __fastcall On_RATTACKPID(struct TCmdParam1 *pCmd, int pnum)
 }
 // 676194: using guessed type char gbBufferMsgs;
 
-int __fastcall On_SPELLID(struct TCmdLocParam2 *pCmd, int pnum)
+int __fastcall On_SPELLID(struct TCmdParam3 *pCmd, int pnum)
 {
-	struct TCmdLocParam2 *v2; // edi
+	struct TCmdParam3 *v2; // edi
 	int v3; // esi
 	int v4; // eax
 
@@ -2814,13 +2801,13 @@ int __fastcall On_SPELLID(struct TCmdLocParam2 *pCmd, int pnum)
 		v3 = pnum;
 		if ( currlevel == plr[pnum].plrlevel )
 		{
-			if ( currlevel || spelldata[(unsigned short)pCmd->wParam1].sTownSpell )
+			if ( currlevel || spelldata[(unsigned short)pCmd->wParam2].sTownSpell )
 			{
 				ClrPlrPath(pnum);
 				plr[v3].destAction = ACTION_SPELLMON;
-				plr[v3].destParam1 = *(unsigned short *)&v2->x;
-				plr[v3].destParam2 = (unsigned short)v2->wParam2;
-				v4 = (unsigned short)v2->wParam1;
+				plr[v3].destParam1 = pCmd->wParam1;
+				plr[v3].destParam2 = (unsigned short)v2->wParam3;
+				v4 = (unsigned short)v2->wParam2;
 				plr[v3]._pSplFrom = 0;
 				plr[v3]._pSpell = v4;
 				plr[v3]._pSplType = plr[v3]._pRSplType;
@@ -2835,9 +2822,9 @@ int __fastcall On_SPELLID(struct TCmdLocParam2 *pCmd, int pnum)
 }
 // 676194: using guessed type char gbBufferMsgs;
 
-int __fastcall On_SPELLPID(struct TCmdLocParam2 *pCmd, int pnum)
+int __fastcall On_SPELLPID(struct TCmdParam3 *pCmd, int pnum)
 {
-	struct TCmdLocParam2 *v2; // edi
+	struct TCmdParam3 *v2; // edi
 	int v3; // esi
 	int v4; // eax
 
@@ -2847,13 +2834,13 @@ int __fastcall On_SPELLPID(struct TCmdLocParam2 *pCmd, int pnum)
 		v3 = pnum;
 		if ( currlevel == plr[pnum].plrlevel )
 		{
-			if ( currlevel || spelldata[(unsigned short)pCmd->wParam1].sTownSpell )
+			if ( currlevel || spelldata[(unsigned short)pCmd->wParam2].sTownSpell )
 			{
 				ClrPlrPath(pnum);
 				plr[v3].destAction = ACTION_SPELLPLR;
-				plr[v3].destParam1 = *(unsigned short *)&v2->x;
-				plr[v3].destParam2 = (unsigned short)v2->wParam2;
-				v4 = (unsigned short)v2->wParam1;
+				plr[v3].destParam1 = v2->wParam1;
+				plr[v3].destParam2 = (unsigned short)v2->wParam3;
+				v4 = (unsigned short)v2->wParam2;
 				plr[v3]._pSplFrom = 0;
 				plr[v3]._pSpell = v4;
 				plr[v3]._pSplType = plr[v3]._pRSplType;
@@ -2868,9 +2855,9 @@ int __fastcall On_SPELLPID(struct TCmdLocParam2 *pCmd, int pnum)
 }
 // 676194: using guessed type char gbBufferMsgs;
 
-int __fastcall On_TSPELLID(struct TCmdLocParam2 *pCmd, int pnum)
+int __fastcall On_TSPELLID(struct TCmdParam3 *pCmd, int pnum)
 {
-	struct TCmdLocParam2 *v2; // edi
+	struct TCmdParam3 *v2; // edi
 	int v3; // esi
 
 	v2 = pCmd;
@@ -2879,13 +2866,13 @@ int __fastcall On_TSPELLID(struct TCmdLocParam2 *pCmd, int pnum)
 		v3 = pnum;
 		if ( currlevel == plr[pnum].plrlevel )
 		{
-			if ( currlevel || spelldata[(unsigned short)pCmd->wParam1].sTownSpell )
+			if ( currlevel || spelldata[(unsigned short)pCmd->wParam2].sTownSpell )
 			{
 				ClrPlrPath(pnum);
 				plr[v3].destAction = ACTION_SPELLMON;
-				plr[v3].destParam1 = *(unsigned short *)&v2->x;
-				plr[v3].destParam2 = (unsigned short)v2->wParam2;
-				plr[v3]._pSpell = (unsigned short)v2->wParam1;
+				plr[v3].destParam1 = v2->wParam1;
+				plr[v3].destParam2 = (unsigned short)v2->wParam3;
+				plr[v3]._pSpell = (unsigned short)v2->wParam2;
 				plr[v3]._pSplType = plr[v3]._pTSplType;
 				plr[v3]._pSplFrom = 2;
 			}
@@ -2899,9 +2886,9 @@ int __fastcall On_TSPELLID(struct TCmdLocParam2 *pCmd, int pnum)
 }
 // 676194: using guessed type char gbBufferMsgs;
 
-int __fastcall On_TSPELLPID(struct TCmdLocParam2 *pCmd, int pnum)
+int __fastcall On_TSPELLPID(struct TCmdParam3 *pCmd, int pnum)
 {
-	struct TCmdLocParam2 *v2; // edi
+	struct TCmdParam3 *v2; // edi
 	int v3; // esi
 
 	v2 = pCmd;
@@ -2910,13 +2897,13 @@ int __fastcall On_TSPELLPID(struct TCmdLocParam2 *pCmd, int pnum)
 		v3 = pnum;
 		if ( currlevel == plr[pnum].plrlevel )
 		{
-			if ( currlevel || spelldata[(unsigned short)pCmd->wParam1].sTownSpell )
+			if ( currlevel || spelldata[(unsigned short)pCmd->wParam2].sTownSpell )
 			{
 				ClrPlrPath(pnum);
 				plr[v3].destAction = ACTION_SPELLPLR;
-				plr[v3].destParam1 = *(unsigned short *)&v2->x;
-				plr[v3].destParam2 = (unsigned short)v2->wParam2;
-				plr[v3]._pSpell = (unsigned short)v2->wParam1;
+				plr[v3].destParam1 = v2->wParam1;
+				plr[v3].destParam2 = (unsigned short)v2->wParam3;
+				plr[v3]._pSpell = (unsigned short)v2->wParam2;
 				plr[v3]._pSplType = plr[v3]._pTSplType;
 				plr[v3]._pSplFrom = 2;
 			}
@@ -3127,10 +3114,10 @@ LABEL_16:
 }
 // 676194: using guessed type char gbBufferMsgs;
 
-int __fastcall On_MONSTDAMAGE(struct TCmdLocParam1 *pCmd, int pnum)
+int __fastcall On_MONSTDAMAGE(struct TCmdParam2 *pCmd, int pnum)
 {
 	int v2; // edi
-	struct TCmdLocParam1 *v3; // edx
+	struct TCmdParam2 *v3; // edx
 	unsigned char *v4; // ebx
 	char *v5; // esi
 	int *v6; // ecx
@@ -3147,16 +3134,16 @@ int __fastcall On_MONSTDAMAGE(struct TCmdLocParam1 *pCmd, int pnum)
 		v4 = (unsigned char *)&plr[v2].plrlevel;
 		if ( currlevel == *(_DWORD *)v4 )
 		{
-			v5 = &monster[*(unsigned short *)&pCmd->x].mWhoHit;
+			v5 = &monster[pCmd->wParam1].mWhoHit;
 			*v5 |= 1 << v2;
-			v6 = &monster[*(unsigned short *)&pCmd->x]._mhitpoints;
+			v6 = &monster[pCmd->wParam1]._mhitpoints;
 			if ( *v6 )
 			{
-				*v6 -= (unsigned short)v3->wParam1;
-				v7 = &monster[*(unsigned short *)&v3->x]._mhitpoints;
+				*v6 -= (unsigned short)v3->wParam2;
+				v7 = &monster[v3->wParam1]._mhitpoints;
 				if ( *v7 >> 6 < 64 )
 					*v7 = 64;
-				delta_monster_hp(*(unsigned short *)&v3->x, monster[*(unsigned short *)&v3->x]._mhitpoints, *v4);
+				delta_monster_hp(v3->wParam1, monster[v3->wParam1]._mhitpoints, *v4);
 			}
 		}
 	}
@@ -3240,7 +3227,7 @@ int __fastcall On_OPENDOOR(struct TCmdParam1 *pCmd, int pnum)
 }
 // 676194: using guessed type char gbBufferMsgs;
 
-void __fastcall delta_sync_object(int oi, unsigned char bCmd, unsigned char bLevel)
+void __fastcall delta_sync_object(int oi, BYTE bCmd, BYTE bLevel)
 {
 	if ( gbMaxPlayers != 1 )
 	{
@@ -3493,17 +3480,14 @@ int __fastcall On_PLAYER_JOINLEVEL(struct TCmdLocParam1 *pCmd, int pnum)
 // 676194: using guessed type char gbBufferMsgs;
 // 67862C: using guessed type char gbActivePlayers;
 
-int __fastcall On_ACTIVATEPORTAL(DJunk *pCmd, int pnum)
+int __fastcall On_ACTIVATEPORTAL(struct TCmdLocParam3 *pCmd, int pnum)
 {
 	signed int v2; // ebx
 	int v3; // edi
-	DJunk *v4; // esi
+	struct TCmdLocParam3 *v4; // esi
 	int v5; // eax
 	int v6; // edx
 	int v7; // ecx
-	int v8; // ST0C_4
-	int v9; // ST08_4
-	int v10; // ST04_4
 
 	v2 = 1;
 	v3 = pnum;
@@ -3516,11 +3500,11 @@ int __fastcall On_ACTIVATEPORTAL(DJunk *pCmd, int pnum)
 	{
 		ActivatePortal(
 			pnum,
-			(unsigned char)pCmd->portal[0].y,
-			(unsigned char)pCmd->portal[0].level,
-			*(unsigned short *)&pCmd->portal[0].ltype,
-			*(unsigned short *)&pCmd->portal[1].x,
-			*(unsigned short *)&pCmd->portal[1].level);
+			pCmd->x,
+			pCmd->y,
+			pCmd->wParam1,
+			pCmd->wParam2,
+			pCmd->wParam3);
 		if ( v3 != myplr )
 		{
 			if ( currlevel )
@@ -3544,7 +3528,7 @@ int __fastcall On_ACTIVATEPORTAL(DJunk *pCmd, int pnum)
 					while ( v7 < nummissiles );
 					if ( v2 )
 LABEL_19:
-						AddWarpMissile(v3, (unsigned char)v4->portal[0].y, (unsigned char)v4->portal[0].level);
+						AddWarpMissile(v3, v4->x, v4->y);
 				}
 				else
 				{
@@ -3556,21 +3540,13 @@ LABEL_19:
 				AddInTownPortal(v3);
 			}
 		}
-		_LOBYTE(v5) = v4->portal[1].level;
-		_LOBYTE(v6) = v4->portal[0].y;
-		v8 = v5;
-		_LOBYTE(v5) = v4->portal[1].x;
-		v9 = v5;
-		_LOBYTE(v5) = v4->portal[0].ltype;
-		v10 = v5;
-		_LOBYTE(v5) = v4->portal[0].level;
-		delta_open_portal(v3, v6, v5, v10, v9, v8);
+		delta_open_portal(v3, v4->x, v4->y, v4->wParam1, v4->wParam2, v4->wParam3);
 	}
 	return 9;
 }
 // 676194: using guessed type char gbBufferMsgs;
 
-void __fastcall delta_open_portal(int pnum, int x, int y, int bLevel, int bLType, int bSetLvl)
+void __fastcall delta_open_portal(int pnum, BYTE x, BYTE y, BYTE bLevel, BYTE bLType, BYTE bSetLvl)
 {
 	int v6; // eax
 
@@ -3734,7 +3710,7 @@ int __fastcall On_SYNCQUEST(struct TCmdQuest *pCmd, int pnum)
 // 67618C: using guessed type char sgbDeltaChanged;
 // 676194: using guessed type char gbBufferMsgs;
 
-int __fastcall On_ENDSHIELD(int a1, int pnum)
+int __fastcall On_ENDSHIELD(struct TCmd *pCmd, int pnum)
 {
 	int v2; // ebx
 	int i; // esi
@@ -3785,7 +3761,7 @@ int __fastcall On_CHEAT_SPELL_LEVEL(struct TCmd *pCmd, int pnum)
 }
 #endif
 
-int __cdecl On_DEBUG()
+int __cdecl On_DEBUG(struct TCmd *pCmd)
 {
 	return 1;
 }
@@ -3814,7 +3790,7 @@ int __fastcall On_NOVA(struct TCmdLoc *pCmd, int pnum)
 }
 // 676194: using guessed type char gbBufferMsgs;
 
-int __fastcall On_SETSHIELD(int unused, int pnum)
+int __fastcall On_SETSHIELD(struct TCmd *pCmd, int pnum)
 {
 	int result; // eax
 
@@ -3825,7 +3801,7 @@ int __fastcall On_SETSHIELD(int unused, int pnum)
 }
 // 676194: using guessed type char gbBufferMsgs;
 
-int __fastcall On_REMSHIELD(int unused, int pnum)
+int __fastcall On_REMSHIELD(struct TCmd *pCmd, int pnum)
 {
 	int result; // eax
 

Source/msg.h

@@ -2,30 +2,14 @@
 #ifndef __MSG_H__
 #define __MSG_H__
 
-extern int sgdwOwnerWait; // weak
-extern int msg_cpp_init_value; // weak
-extern int sgdwRecvOffset; // idb
-extern int sgnCurrMegaPlayer; // weak
-extern DLevel sgLevels[NUMLEVELS];
-extern char sbLastCmd; // weak
-extern TMegaPkt *sgpCurrPkt;
-extern char sgRecvBuf[4722];
-extern unsigned char sgbRecvCmd; // idb
-extern LocalLevel sgLocals[NUMLEVELS];
-extern DJunk sgJunk;
-extern TMegaPkt *sgpMegaPkt;
-extern char sgbDeltaChanged; // weak
-extern char sgbDeltaChunks; // weak
-extern int deltaload; // weak
-extern char gbBufferMsgs; // weak
-extern int dword_676198; // weak
-extern int msg_err_timer; // weak
+extern int deltaload;
+extern BYTE gbBufferMsgs;
+extern int pkt_counter;
 
-void __cdecl msg_cpp_init();
 void __fastcall msg_send_drop_pkt(int pnum, int reason);
-void __fastcall msg_send_packet(int pnum, void *packet, int dwSize);
+void __fastcall msg_send_packet(int pnum, const void *packet, DWORD dwSize);
 TMegaPkt *__cdecl msg_get_next_packet();
-int __cdecl msg_wait_resync();
+BOOL __cdecl msg_wait_resync();
 void __cdecl msg_free_packets();
 int __cdecl msg_wait_for_turns();
 void __cdecl msg_process_net_packets();
@@ -34,46 +18,46 @@ void __fastcall DeltaExportData(int pnum);
 void *__fastcall DeltaExportItem(void *dst, void *src);
 void *__fastcall DeltaExportObject(void *dst, void *src);
 void *__fastcall DeltaExportMonster(void *dst, void *src);
-char *__fastcall DeltaExportJunk(char *a1);
-int __fastcall msg_comp_level(char *buffer, int size);
+void *__fastcall DeltaExportJunk(void *dst);
+int __fastcall msg_comp_level(char *begin, void *end);
 void __cdecl delta_init();
-void __fastcall delta_kill_monster(int mi, unsigned char x, unsigned char y, unsigned char bLevel);
-void __fastcall delta_monster_hp(int mi, int hp, unsigned char bLevel);
-void __fastcall delta_sync_monster(TCmdLocParam1 *packet, char level);
-void __fastcall delta_sync_golem(TCmdGolem *pG, int pnum, int bLevel);
-void __fastcall delta_leave_sync(unsigned char bLevel);
-bool __fastcall delta_portal_inited(int i);
-bool __fastcall delta_quest_inited(int i);
+void __fastcall delta_kill_monster(int mi, BYTE x, BYTE y, BYTE bLevel);
+void __fastcall delta_monster_hp(int mi, int hp, BYTE bLevel);
+void __fastcall delta_sync_monster(TCmdLocParam1 *packet, BYTE level);
+void __fastcall delta_sync_golem(TCmdGolem *pG, int pnum, BYTE bLevel);
+void __fastcall delta_leave_sync(BYTE bLevel);
+BOOL __fastcall delta_portal_inited(int i);
+BOOL __fastcall delta_quest_inited(int i);
 void __fastcall DeltaAddItem(int ii);
 void __cdecl DeltaSaveLevel();
 void __cdecl DeltaLoadLevel();
-void __fastcall NetSendCmd(BOOL bHiPri, unsigned char bCmd);
-void __fastcall NetSendCmdGolem(unsigned char mx, unsigned char my, unsigned char dir, unsigned char menemy, int hp, int cl);
-void __fastcall NetSendCmdLoc(BOOL bHiPri, unsigned char bCmd, unsigned char x, unsigned char y);
-void __fastcall NetSendCmdLocParam1(BOOL bHiPri, unsigned char bCmd, unsigned char x, unsigned char y, unsigned short wParam1);
-void __fastcall NetSendCmdLocParam2(BOOL bHiPri, unsigned char bCmd, unsigned char x, unsigned char y, unsigned short wParam1, unsigned short wParam2);
-void __fastcall NetSendCmdLocParam3(BOOL bHiPri, unsigned char bCmd, unsigned char x, unsigned char y, unsigned short wParam1, unsigned short wParam2, unsigned short wParam3);
-void __fastcall NetSendCmdParam1(BOOL bHiPri, unsigned char bCmd, unsigned short wParam1);
-void __fastcall NetSendCmdParam2(BOOL bHiPri, unsigned char bCmd, unsigned short wParam1, unsigned short wParam2);
-void __fastcall NetSendCmdParam3(BOOL bHiPri, unsigned char bCmd, unsigned short wParam1, unsigned short wParam2, unsigned short wParam3);
-void __fastcall NetSendCmdQuest(BOOL bHiPri, unsigned char q);
-void __fastcall NetSendCmdGItem(BOOL bHiPri, unsigned char bCmd, unsigned char mast, unsigned char pnum, int ii);
-void __fastcall NetSendCmdGItem2(BOOL usonly, unsigned char bCmd, unsigned char mast, unsigned char pnum, struct TCmdGItem *p);
-bool __fastcall NetSendCmdReq2(unsigned char bCmd, unsigned char mast, unsigned char pnum, struct TCmdGItem *p);
+void __fastcall NetSendCmd(BOOL bHiPri, BYTE bCmd);
+void __fastcall NetSendCmdGolem(BYTE mx, BYTE my, BYTE dir, BYTE menemy, int hp, int cl);
+void __fastcall NetSendCmdLoc(BOOL bHiPri, BYTE bCmd, BYTE x, BYTE y);
+void __fastcall NetSendCmdLocParam1(BOOL bHiPri, BYTE bCmd, BYTE x, BYTE y, WORD wParam1);
+void __fastcall NetSendCmdLocParam2(BOOL bHiPri, BYTE bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2);
+void __fastcall NetSendCmdLocParam3(BOOL bHiPri, BYTE bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2, WORD wParam3);
+void __fastcall NetSendCmdParam1(BOOL bHiPri, BYTE bCmd, WORD wParam1);
+void __fastcall NetSendCmdParam2(BOOL bHiPri, BYTE bCmd, WORD wParam1, WORD wParam2);
+void __fastcall NetSendCmdParam3(BOOL bHiPri, BYTE bCmd, WORD wParam1, WORD wParam2, WORD wParam3);
+void __fastcall NetSendCmdQuest(BOOL bHiPri, BYTE q);
+void __fastcall NetSendCmdGItem(BOOL bHiPri, BYTE bCmd, BYTE mast, BYTE pnum, int ii);
+void __fastcall NetSendCmdGItem2(BOOL usonly, BYTE bCmd, BYTE mast, BYTE pnum, struct TCmdGItem *p);
+bool __fastcall NetSendCmdReq2(BYTE bCmd, BYTE mast, BYTE pnum, struct TCmdGItem *p);
 void __fastcall NetSendCmdExtra(struct TCmdGItem *p);
-void __fastcall NetSendCmdPItem(BOOL bHiPri, unsigned char bCmd, unsigned char x, unsigned char y);
-void __fastcall NetSendCmdChItem(BOOL bHiPri, unsigned char bLoc);
-void __fastcall NetSendCmdDelItem(BOOL bHiPri, unsigned char bLoc);
+void __fastcall NetSendCmdPItem(BOOL bHiPri, BYTE bCmd, BYTE x, BYTE y);
+void __fastcall NetSendCmdChItem(BOOL bHiPri, BYTE bLoc);
+void __fastcall NetSendCmdDelItem(BOOL bHiPri, BYTE bLoc);
 void __fastcall NetSendCmdDItem(BOOL bHiPri, int ii);
-void __fastcall NetSendCmdDamage(BOOL bHiPri, unsigned char bPlr, unsigned int dwDam);
-void __fastcall NetSendCmdString(int a1, const char *pszStr);
+void __fastcall NetSendCmdDamage(BOOL bHiPri, BYTE bPlr, DWORD dwDam);
+void __fastcall NetSendCmdString(int player_mask, const char *pszStr);
 void __fastcall RemovePlrPortal(int pnum);
 int __fastcall ParseCmd(int pnum, TCmd *pCmd);
-void __fastcall DeltaImportData(unsigned char cmd, int recv_offset);
+void __fastcall DeltaImportData(BYTE cmd, DWORD recv_offset);
 void *__fastcall DeltaImportItem(void *src, void *dst);
 void *__fastcall DeltaImportObject(void *src, void *dst);
 void *__fastcall DeltaImportMonster(void *src, void *dst);
-char __fastcall DeltaImportJunk(int a1);
+void __fastcall DeltaImportJunk(void *src);
 int __fastcall On_SYNCDATA(void *packet, int pnum);
 int __fastcall On_WALKXY(struct TCmdLoc *pCmd, int pnum);
 int __fastcall On_ADDSTR(struct TCmdParam1 *pCmd, int pnum);
@@ -81,18 +65,18 @@ int __fastcall On_ADDMAG(struct TCmdParam1 *pCmd, int pnum);
 int __fastcall On_ADDDEX(struct TCmdParam1 *pCmd, int pnum);
 int __fastcall On_ADDVIT(struct TCmdParam1 *pCmd, int pnum);
 int __fastcall On_SBSPELL(struct TCmdParam1 *pCmd, int pnum);
-void msg_errorf(char *pszFmt, ...);
+void msg_errorf(const char *pszFmt, ...);
 int __fastcall On_GOTOGETITEM(struct TCmdLocParam1 *pCmd, int pnum);
 int __fastcall On_REQUESTGITEM(struct TCmdGItem *pCmd, int pnum);
-bool __fastcall i_own_level(int nReqLevel);
+BOOL __fastcall i_own_level(int nReqLevel);
 int __fastcall On_GETITEM(struct TCmdGItem *pCmd, int pnum);
-bool __fastcall delta_get_item(struct TCmdGItem *pI, unsigned char bLevel);
+BOOL __fastcall delta_get_item(struct TCmdGItem *pI, BYTE bLevel);
 int __fastcall On_GOTOAGETITEM(struct TCmdLocParam1 *pCmd, int pnum);
 int __fastcall On_REQUESTAGITEM(struct TCmdGItem *pCmd, int pnum);
 int __fastcall On_AGETITEM(struct TCmdGItem *pCmd, int pnum);
 int __fastcall On_ITEMEXTRA(struct TCmdGItem *pCmd, int pnum);
 int __fastcall On_PUTITEM(struct TCmdPItem *pCmd, int pnum);
-void __fastcall delta_put_item(struct TCmdPItem *pI, int x, int y, unsigned char bLevel);
+void __fastcall delta_put_item(struct TCmdPItem *pI, int x, int y, BYTE bLevel);
 void __fastcall check_update_plr(int pnum);
 int __fastcall On_SYNCPUTITEM(struct TCmdPItem *pCmd, int pnum);
 int __fastcall On_RESPAWNITEM(struct TCmdPItem *pCmd, int pnum);
@@ -109,10 +93,10 @@ int __fastcall On_ATTACKID(struct TCmdParam1 *pCmd, int pnum);
 int __fastcall On_ATTACKPID(struct TCmdParam1 *pCmd, int pnum);
 int __fastcall On_RATTACKID(struct TCmdParam1 *pCmd, int pnum);
 int __fastcall On_RATTACKPID(struct TCmdParam1 *pCmd, int pnum);
-int __fastcall On_SPELLID(struct TCmdLocParam2 *pCmd, int pnum);
-int __fastcall On_SPELLPID(struct TCmdLocParam2 *pCmd, int pnum);
-int __fastcall On_TSPELLID(struct TCmdLocParam2 *pCmd, int pnum);
-int __fastcall On_TSPELLPID(struct TCmdLocParam2 *pCmd, int pnum);
+int __fastcall On_SPELLID(struct TCmdParam3 *pCmd, int pnum);
+int __fastcall On_SPELLPID(struct TCmdParam3 *pCmd, int pnum);
+int __fastcall On_TSPELLID(struct TCmdParam3 *pCmd, int pnum);
+int __fastcall On_TSPELLPID(struct TCmdParam3 *pCmd, int pnum);
 int __fastcall On_KNOCKBACK(struct TCmdParam1 *pCmd, int pnum);
 int __fastcall On_RESURRECT(struct TCmdParam1 *pCmd, int pnum);
 int __fastcall On_HEALOTHER(struct TCmdParam1 *pCmd, int pnum);
@@ -122,11 +106,11 @@ int __fastcall On_WARP(struct TCmdParam1 *pCmd, int pnum);
 int __fastcall On_MONSTDEATH(struct TCmdLocParam1 *pCmd, int pnum);
 int __fastcall On_KILLGOLEM(struct TCmdLocParam1 *pCmd, int pnum);
 int __fastcall On_AWAKEGOLEM(struct TCmdGolem *pCmd, int pnum);
-int __fastcall On_MONSTDAMAGE(struct TCmdLocParam1 *pCmd, int pnum);
+int __fastcall On_MONSTDAMAGE(struct TCmdParam2 *pCmd, int pnum);
 int __fastcall On_PLRDEAD(struct TCmdParam1 *pCmd, int pnum);
 int __fastcall On_PLRDAMAGE(struct TCmdDamage *pCmd, int pnum);
 int __fastcall On_OPENDOOR(struct TCmdParam1 *pCmd, int pnum);
-void __fastcall delta_sync_object(int oi, unsigned char bCmd, unsigned char bLevel);
+void __fastcall delta_sync_object(int oi, BYTE bCmd, BYTE bLevel);
 int __fastcall On_CLOSEDOOR(struct TCmdParam1 *pCmd, int pnum);
 int __fastcall On_OPERATEOBJ(struct TCmdParam1 *pCmd, int pnum);
 int __fastcall On_PLROPOBJ(struct TCmdParam2 *pCmd, int pnum);
@@ -138,8 +122,8 @@ int __fastcall On_DROPITEM(struct TCmdPItem *pCmd, int pnum);
 int __fastcall On_SEND_PLRINFO(struct TCmdPlrInfoHdr *pCmd, int pnum);
 int __fastcall On_ACK_PLRINFO(struct TCmdPlrInfoHdr *pCmd, int pnum);
 int __fastcall On_PLAYER_JOINLEVEL(struct TCmdLocParam1 *pCmd, int pnum);
-int __fastcall On_ACTIVATEPORTAL(DJunk *pCmd, int pnum);
-void __fastcall delta_open_portal(int pnum, int x, int y, int bLevel, int bLType, int bSetLvl);
+int __fastcall On_ACTIVATEPORTAL(struct TCmdLocParam3 *pCmd, int pnum);
+void __fastcall delta_open_portal(int pnum, BYTE x, BYTE y, BYTE bLevel, BYTE bLType, BYTE bSetLvl);
 int __fastcall On_DEACTIVATEPORTAL(struct TCmd *pCmd, int pnum);
 int __fastcall On_RETOWN(struct TCmd *pCmd, int pnum);
 int __fastcall On_SETSTR(struct TCmdParam1 *pCmd, int pnum);
@@ -148,18 +132,14 @@ int __fastcall On_SETMAG(struct TCmdParam1 *pCmd, int pnum);
 int __fastcall On_SETVIT(struct TCmdParam1 *pCmd, int pnum);
 int __fastcall On_STRING(struct TCmdString *pCmd, int pnum);
 int __fastcall On_SYNCQUEST(struct TCmdQuest *pCmd, int pnum);
-int __fastcall On_ENDSHIELD(int a1, int pnum);
+int __fastcall On_ENDSHIELD(struct TCmd *pCmd, int pnum);
 #ifdef _DEBUG
 int __fastcall On_CHEAT_EXPERIENCE(struct TCmd *pCmd, int pnum);
 int __fastcall On_CHEAT_SPELL_LEVEL(struct TCmd *pCmd, int pnum);
 #endif
-int __cdecl On_DEBUG();
+int __cdecl On_DEBUG(struct TCmd *pCmd);
 int __fastcall On_NOVA(struct TCmdLoc *pCmd, int pnum);
-int __fastcall On_SETSHIELD(int unused, int pnum);
-int __fastcall On_REMSHIELD(int unused, int pnum);
-
-/* rdata */
-
-extern const int msg_inf; // weak
+int __fastcall On_SETSHIELD(struct TCmd *pCmd, int pnum);
+int __fastcall On_REMSHIELD(struct TCmd *pCmd, int pnum);
 
 #endif /* __MSG_H__ */

Source/multi.cpp

@@ -21,10 +21,10 @@ int sglTimeoutStart; // weak
 int sgdwPlayerLeftReasonTbl[MAX_PLRS];
 char pkdata_678658[4100];
 unsigned int sgdwGameLoops; // idb
-UCHAR gbMaxPlayers; // weak
+BYTE gbMaxPlayers; // weak
 char sgbTimeout; // weak
 char szPlayerName[128];
-char gbDeltaSender; // weak
+BYTE gbDeltaSender; // weak
 int sgbNetInited; // weak
 int player_state[MAX_PLRS];
 
@@ -121,7 +121,7 @@ void __fastcall NetRecvPlrData(TPkt *pkt)
 	pkt->hdr.bdex = plr[myplr]._pBaseDex;
 }
 
-void __fastcall NetSendHiPri(unsigned char *pbMsg, unsigned char bLen)
+void __fastcall NetSendHiPri(BYTE *pbMsg, BYTE bLen)
 {
 	unsigned char *v2; // edi
 	unsigned char v3; // bl
@@ -552,7 +552,7 @@ void __cdecl multi_process_network_packets()
 	{
 		do
 		{
-			++dword_676198;
+			++pkt_counter;
 			multi_clear_left_tbl();
 			v1 = pkt;
 			v2 = pkt;
@@ -627,7 +627,7 @@ void __cdecl multi_process_network_packets()
 		nthread_terminate_game("SNetReceiveMsg");
 }
 // 676194: using guessed type char gbBufferMsgs;
-// 676198: using guessed type int dword_676198;
+// 676198: using guessed type int pkt_counter;
 
 void __fastcall multi_handle_all_packets(int players, TPkt *packet, int a3)
 {
@@ -775,7 +775,7 @@ void __stdcall multi_handle_events(_SNETEVENT *pEvt)
 				gbSomebodyWonGameKludge = 1;
 			sgbSendDeltaTbl[pEvt->playerid] = 0;
 			dthread_remove_player(pEvt->playerid);
-			if ( (unsigned char)gbDeltaSender == pEvt->playerid )
+			if ( gbDeltaSender == pEvt->playerid )
 				gbDeltaSender = 4;
 			break;
 		case EVENT_TYPE_PLAYER_MESSAGE:

Source/multi.h

@@ -21,10 +21,10 @@ extern int sglTimeoutStart; // weak
 extern int sgdwPlayerLeftReasonTbl[MAX_PLRS];
 extern char pkdata_678658[4100];
 extern unsigned int sgdwGameLoops; // idb
-extern UCHAR gbMaxPlayers;
+extern BYTE gbMaxPlayers;
 extern char sgbTimeout; // weak
 extern char szPlayerName[128];
-extern char gbDeltaSender; // weak
+extern BYTE gbDeltaSender; // weak
 extern int sgbNetInited; // weak
 extern int player_state[MAX_PLRS];
 

Source/nthread.cpp

@@ -8,7 +8,7 @@ int gdwMsgLenTbl[4];
 static CRITICAL_SECTION sgMemCrit;
 int gdwDeltaBytesSec; // weak
 char nthread_should_run; // weak
-int gdwTurnsInTransit; // weak
+DWORD gdwTurnsInTransit; // weak
 int glpMsgTbl[4];
 unsigned int glpNThreadId;
 char sgbSyncCountdown; // weak
@@ -312,7 +312,7 @@ void __fastcall nthread_ignore_mutex(bool bStart)
 }
 // 67975A: using guessed type char sgbThreadIsRunning;
 
-bool __cdecl nthread_has_500ms_passed()
+BOOL __cdecl nthread_has_500ms_passed()
 {
 	DWORD currentTickCount; // eax
 	int ticksElapsed; // ecx

Source/nthread.h

@@ -7,7 +7,7 @@ extern char byte_679704; // weak
 extern int gdwMsgLenTbl[4];
 extern int gdwDeltaBytesSec; // weak
 extern char nthread_should_run; // weak
-extern int gdwTurnsInTransit; // weak
+extern DWORD gdwTurnsInTransit; // weak
 extern int glpMsgTbl[4];
 extern unsigned int glpNThreadId;
 extern char sgbSyncCountdown; // weak
@@ -30,7 +30,7 @@ void __fastcall nthread_start(bool set_turn_upper_bit);
 unsigned int __stdcall nthread_handler(void *a1);
 void __cdecl nthread_cleanup();
 void __fastcall nthread_ignore_mutex(bool bStart);
-bool __cdecl nthread_has_500ms_passed();
+BOOL __cdecl nthread_has_500ms_passed();
 
 /* rdata */
 

Source/player.cpp

@@ -43,7 +43,7 @@ int VitalityTbl[3] = { 25, 20, 20 };
 int ToBlkTbl[3] = { 30, 20, 10 };
 char *ClassStrTblOld[3] = { "Warrior", "Rogue", "Sorceror" }; // unused
 int MaxStats[3][4] = { { 250, 50, 60, 100 }, { 55, 70, 250, 80 }, { 45, 250, 85, 80 } };
-int ExpLvlsTbl[51] = {
+int ExpLvlsTbl[MAXCHARLEVEL] = {
     0,
     2000,
     4620,

Source/player.h

@@ -133,7 +133,7 @@ extern int VitalityTbl[3];
 extern int ToBlkTbl[3];
 extern char *ClassStrTblOld[3];
 extern int MaxStats[3][4];
-extern int ExpLvlsTbl[51];
+extern int ExpLvlsTbl[MAXCHARLEVEL];
 extern char *ClassStrTbl[3];
 extern unsigned char fix[9];
 

Source/quests.cpp

@@ -1247,7 +1247,7 @@ void __cdecl QuestlogESC()
 // 69BE90: using guessed type int qline;
 // 69BED4: using guessed type int numqlines;
 
-void __fastcall SetMultiQuest(int q, int s, unsigned char l, int v1)
+void __fastcall SetMultiQuest(int q, int s, int l, int v1)
 {
 	int v4; // eax
 	unsigned char *v5; // ecx

Source/quests.h

@@ -40,7 +40,7 @@ void __cdecl QuestlogUp();
 void __cdecl QuestlogDown();
 void __cdecl QuestlogEnter();
 void __cdecl QuestlogESC();
-void __fastcall SetMultiQuest(int q, int s, unsigned char l, int v1);
+void __fastcall SetMultiQuest(int q, int s, int l, int v1);
 
 /* rdata */
 extern QuestData questlist[MAXQUESTS];

defs.h

@@ -30,6 +30,7 @@
 #define MAXTRIGGERS				5
 #define MDMAXX					40
 #define MDMAXY					40
+#define MAXCHARLEVEL			51
 
 // number of inventory grid cells
 #define NUM_INV_GRID_ELEM		40

structs.h

@@ -693,218 +693,218 @@ struct PortalStruct {
 
 #pragma pack(push, 1)
 struct TCmd {
-    unsigned char bCmd;
+    BYTE bCmd;
 };
 
 struct TCmdLoc {
-    unsigned char bCmd;
-    unsigned char x;
-    unsigned char y;
+    BYTE bCmd;
+    BYTE x;
+    BYTE y;
 };
 
 struct TCmdLocParam1 {
-    unsigned char bCmd;
-    unsigned char x;
-    unsigned char y;
-    unsigned short wParam1;
+    BYTE bCmd;
+    BYTE x;
+    BYTE y;
+    WORD wParam1;
 };
 
 struct TCmdLocParam2 {
-    unsigned char bCmd;
-    unsigned char x;
-    unsigned char y;
-    unsigned short wParam1;
-    unsigned short wParam2;
+    BYTE bCmd;
+    BYTE x;
+    BYTE y;
+    WORD wParam1;
+    WORD wParam2;
 };
 
 struct TCmdLocParam3 {
-    unsigned char bCmd;
-    unsigned char x;
-    unsigned char y;
-    unsigned short wParam1;
-    unsigned short wParam2;
-    unsigned short wParam3;
+    BYTE bCmd;
+    BYTE x;
+    BYTE y;
+    WORD wParam1;
+    WORD wParam2;
+    WORD wParam3;
 };
 
 struct TCmdParam1 {
-    unsigned char bCmd;
-    unsigned short wParam1;
+    BYTE bCmd;
+    WORD wParam1;
 };
 
 struct TCmdParam2 {
-    unsigned char bCmd;
-    unsigned short wParam1;
-    unsigned short wParam2;
+    BYTE bCmd;
+    WORD wParam1;
+    WORD wParam2;
 };
 
 struct TCmdParam3 {
-    unsigned char bCmd;
-    unsigned short wParam1;
-    unsigned short wParam2;
-    unsigned short wParam3;
+    BYTE bCmd;
+    WORD wParam1;
+    WORD wParam2;
+    WORD wParam3;
 };
 
 struct TCmdGolem {
-    unsigned char bCmd;
-    unsigned char _mx;
-    unsigned char _my;
-    unsigned char _mdir;
-    unsigned char _menemy;
+    BYTE bCmd;
+    BYTE _mx;
+    BYTE _my;
+    BYTE _mdir;
+    BYTE _menemy;
     int _mhitpoints;
-    unsigned char _currlevel;
+    BYTE _currlevel;
 };
 
 struct TCmdQuest {
-    unsigned char bCmd;
-    unsigned char q;
-    unsigned char qstate;
-    unsigned char qlog;
-    unsigned char qvar1;
+    BYTE bCmd;
+    BYTE q;
+    BYTE qstate;
+    BYTE qlog;
+    BYTE qvar1;
 };
 
 struct TCmdGItem {
-    unsigned char bCmd;
-    unsigned char bMaster;
-    unsigned char bPnum;
-    unsigned char bCursitem;
-    unsigned char bLevel;
-    unsigned char x;
-    unsigned char y;
-    unsigned short wIndx;
-    unsigned short wCI;
-    int dwSeed;
-    unsigned char bId;
-    unsigned char bDur;
-    unsigned char bMDur;
-    unsigned char bCh;
-    unsigned char bMCh;
-    unsigned short wValue;
-    int dwBuff;
-    int dwTime;
+    BYTE bCmd;
+    BYTE bMaster;
+    BYTE bPnum;
+    BYTE bCursitem;
+    BYTE bLevel;
+    BYTE x;
+    BYTE y;
+    WORD wIndx;
+    WORD wCI;
+    DWORD dwSeed;
+    BYTE bId;
+    BYTE bDur;
+    BYTE bMDur;
+    BYTE bCh;
+    BYTE bMCh;
+    WORD wValue;
+    DWORD dwBuff;
+    DWORD dwTime;
 };
 
 struct TCmdPItem {
-    char bCmd; /* unsigned */
-    unsigned char x;
-    unsigned char y;
-    unsigned short wIndx;
-    unsigned short wCI;
-    int dwSeed;
-    unsigned char bId;
-    unsigned char bDur;
-    unsigned char bMDur;
-    unsigned char bCh;
-    unsigned char bMCh;
-    unsigned short wValue;
-    int dwBuff;
+    BYTE bCmd;
+    BYTE x;
+    BYTE y;
+    WORD wIndx;
+    WORD wCI;
+    DWORD dwSeed;
+    BYTE bId;
+    BYTE bDur;
+    BYTE bMDur;
+    BYTE bCh;
+    BYTE bMCh;
+    WORD wValue;
+    DWORD dwBuff;
 };
 
 struct TCmdChItem {
-    unsigned char bCmd;
-    unsigned char bLoc;
-    unsigned short wIndx;
-    unsigned short wCI;
-    int dwSeed;
-    unsigned char bId;
+    BYTE bCmd;
+    BYTE bLoc;
+    WORD wIndx;
+    WORD wCI;
+    DWORD dwSeed;
+    BYTE bId;
 };
 
 struct TCmdDelItem {
-    unsigned char bCmd;
-    unsigned char bLoc;
+    BYTE bCmd;
+    BYTE bLoc;
 };
 
 struct TCmdDamage {
-    unsigned char bCmd;
-    unsigned char bPlr;
-    int dwDam;
+    BYTE bCmd;
+    BYTE bPlr;
+    DWORD dwDam;
 };
 
 struct TCmdPlrInfoHdr {
-    unsigned char bCmd;
-    unsigned short wOffset;
-    unsigned short wBytes;
+    BYTE bCmd;
+    WORD wOffset;
+    WORD wBytes;
 };
 
 struct TCmdString {
-    unsigned char bCmd;
-    char str[80];
+    BYTE bCmd;
+    char str[MAX_SEND_STR_LEN];
 };
 
 struct TFakeCmdPlr {
-    unsigned char bCmd;
-    unsigned char bPlr;
+    BYTE bCmd;
+    BYTE bPlr;
 };
 
 struct TFakeDropPlr {
-    unsigned char bCmd;
-    unsigned char bPlr;
-    int dwReason;
+    BYTE bCmd;
+    BYTE bPlr;
+    DWORD dwReason;
 };
 
 struct TSyncHeader {
-    unsigned char bCmd;
-    unsigned char bLevel;
-    unsigned short wLen;
-    unsigned char bObjId;
-    unsigned char bObjCmd;
-    unsigned char bItemI;
-    unsigned char bItemX;
-    unsigned char bItemY;
-    unsigned short wItemIndx;
-    unsigned short wItemCI;
-    int dwItemSeed;
-    unsigned char bItemId;
-    unsigned char bItemDur;
-    unsigned char bItemMDur;
-    unsigned char bItemCh;
-    unsigned char bItemMCh;
-    unsigned short wItemVal;
-    unsigned int dwItemBuff;
-    unsigned char bPInvLoc;
-    unsigned short wPInvIndx;
-    unsigned short wPInvCI;
-    int dwPInvSeed;
-    unsigned char bPInvId;
+    BYTE bCmd;
+    BYTE bLevel;
+    WORD wLen;
+    BYTE bObjId;
+    BYTE bObjCmd;
+    BYTE bItemI;
+    BYTE bItemX;
+    BYTE bItemY;
+    WORD wItemIndx;
+    WORD wItemCI;
+    DWORD dwItemSeed;
+    BYTE bItemId;
+    BYTE bItemDur;
+    BYTE bItemMDur;
+    BYTE bItemCh;
+    BYTE bItemMCh;
+    WORD wItemVal;
+    DWORD dwItemBuff;
+    BYTE bPInvLoc;
+    WORD wPInvIndx;
+    WORD wPInvCI;
+    DWORD dwPInvSeed;
+    BYTE bPInvId;
 };
 
 struct TSyncMonster {
-    unsigned char _mndx;
-    unsigned char _mx;
-    unsigned char _my;
-    unsigned char _menemy;
-    unsigned char _mdelta;
+    BYTE _mndx;
+    BYTE _mx;
+    BYTE _my;
+    BYTE _menemy;
+    BYTE _mdelta;
 };
 
 struct TPktHdr {
-    unsigned char px;
-    unsigned char py;
-    unsigned char targx;
-    unsigned char targy;
+    BYTE px;
+    BYTE py;
+    BYTE targx;
+    BYTE targy;
     int php;
     int pmhp;
-    unsigned char bstr;
-    unsigned char bmag;
-    unsigned char bdex;
-    unsigned short wCheck;
-    unsigned short wLen;
+    BYTE bstr;
+    BYTE bmag;
+    BYTE bdex;
+    WORD wCheck;
+    WORD wLen;
 };
 
 struct TPkt {
     TPktHdr hdr;
-    unsigned char body[493];
+    BYTE body[493];
 };
 
 struct DMonsterStr {
-    char _mx; /* these might be unsigned */
-    char _my;
-    char _mdir;
-    char _menemy;
-    char _mactive;
+    BYTE _mx;
+    BYTE _my;
+    BYTE _mdir;
+    BYTE _menemy;
+    BYTE _mactive;
     int _mhitpoints;
 };
 
 struct DObjectStr {
-    unsigned char bCmd;
+    BYTE bCmd;
 };
 
 struct DLevel {
@@ -914,21 +914,21 @@ struct DLevel {
 };
 
 struct LocalLevel {
-    unsigned char automapsv[40][40];
+    BYTE automapsv[40][40];
 };
 
 struct DPortal {
-    unsigned char x;
-    unsigned char y;
-    unsigned char level;
-    unsigned char ltype;
-    unsigned char setlvl;
+    BYTE x;
+    BYTE y;
+    BYTE level;
+    BYTE ltype;
+    BYTE setlvl;
 };
 
 struct MultiQuests {
-    unsigned char qstate;
-    unsigned char qlog;
-    unsigned char qvar1;
+    BYTE qstate;
+    BYTE qlog;
+    BYTE qvar1;
 };
 
 struct DJunk {
@@ -939,8 +939,8 @@ struct DJunk {
 
 struct TMegaPkt {
     TMegaPkt *pNext;
-    int dwSpaceLeft;
-    unsigned char data[32000];
+    DWORD dwSpaceLeft;
+    BYTE data[32000];
 };
 
 //////////////////////////////////////////////////