Merge pull request #142 from AJenbo/StartNewLvl

Clean up StartNewLvl

Source/msg.cpp

@@ -1002,7 +1002,7 @@ void __fastcall NetSendCmdParam1(BOOL bHiPri, unsigned char bCmd, unsigned short
 		NetSendLoPri((unsigned char *)&cmd, 3u);
 }
 
-void __fastcall NetSendCmdParam2(unsigned char bHiPri, unsigned char bCmd, unsigned short wParam1, unsigned short wParam2)
+void __fastcall NetSendCmdParam2(BOOL bHiPri, unsigned char bCmd, unsigned short wParam1, unsigned short wParam2)
 {
 	TCmdParam2 cmd; // [esp+0h] [ebp-8h]
 

Source/msg.h

@@ -54,7 +54,7 @@ void __fastcall NetSendCmdLocParam1(unsigned char bHiPri, unsigned char bCmd, un
 void __fastcall NetSendCmdLocParam2(unsigned char bHiPri, unsigned char bCmd, unsigned char x, unsigned char y, int wParam1, int wParam2);
 void __fastcall NetSendCmdLocParam3(unsigned char bHiPri, unsigned char bCmd, unsigned char x, unsigned char y, int wParam1, int wParam2, int wParam3);
 void __fastcall NetSendCmdParam1(BOOL bHiPri, unsigned char bCmd, unsigned short wParam1);
-void __fastcall NetSendCmdParam2(unsigned char bHiPri, unsigned char bCmd, unsigned short wParam1, unsigned short wParam2);
+void __fastcall NetSendCmdParam2(BOOL bHiPri, unsigned char bCmd, unsigned short wParam1, unsigned short wParam2);
 void __fastcall NetSendCmdParam3(unsigned char bHiPri, unsigned char bCmd, unsigned short wParam1, unsigned short wParam2, int wParam3);
 void __fastcall NetSendCmdQuest(unsigned char bHiPri, unsigned char q);
 void __fastcall NetSendCmdGItem(unsigned char bHiPri, unsigned char bCmd, unsigned char mast, unsigned char pnum, int ii);

Source/player.cpp

@@ -2206,51 +2206,41 @@ void __fastcall InitLevelChange(int pnum)
 
 void __fastcall StartNewLvl(int pnum, int fom, int lvl)
 {
-	int v3; // edi
-	unsigned int v4; // esi
-	unsigned int v5; // eax
-	HWND v6; // ST00_4
-
-	v3 = fom;
-	v4 = pnum;
 	InitLevelChange(pnum);
-	if ( v4 >= 4 )
+
-		TermMsg("StartNewLvl: illegal player %d", v4);
+	if ( (DWORD)pnum >= MAX_PLRS ) {
-	if ( v3 < WM_DIABNEXTLVL )
+		TermMsg("StartNewLvl: illegal player %d", pnum);
-	{
-LABEL_10:
-		TermMsg("StartNewLvl");
-		goto LABEL_11;
 	}
-	if ( v3 <= WM_DIABPREVLVL || v3 == WM_DIABRTNLVL )
+
-		goto LABEL_16;
+	switch ( fom ) {
-	if ( v3 != WM_DIABSETLVL )
+		case WM_DIABNEXTLVL:
-	{
+		case WM_DIABPREVLVL:
-		if ( v3 != WM_DIABTOWNWARP )
+			plr[pnum].plrlevel = lvl;
-		{
+			break;
-			if ( v3 != WM_DIABTWARPUP )
+		case WM_DIABRTNLVL:
-			{
+		case WM_DIABTOWNWARP:
-				if ( v3 == WM_DIABRETOWN )
+			plr[pnum].plrlevel = lvl;
-					goto LABEL_11;
+			break;
-				goto LABEL_10;
+		case WM_DIABSETLVL:
-			}
+			setlvlnum = lvl;
+			break;
+		case WM_DIABTWARPUP:
 			plr[myplr].pTownWarps |= 1 << (leveltype - 2);
-		}
+			plr[pnum].plrlevel = lvl;
-LABEL_16:
+			break;
-		plr[v4].plrlevel = lvl;
+		case WM_DIABRETOWN:
-		goto LABEL_11;
+			break;
+		default:
+			TermMsg("StartNewLvl");
 	}
-	setlvlnum = lvl;
+
-LABEL_11:
+	if ( pnum == myplr ) {
-	if ( v4 == myplr )
+		plr[pnum]._pmode = PM_NEWLVL;
-	{
+		plr[pnum]._pInvincible = TRUE;
-		v5 = v4;
+		PostMessageA(ghMainWnd, fom, 0, 0);
-		v6 = ghMainWnd;
+		if ( gbMaxPlayers > 1 ) {
-		plr[v5]._pmode = PM_NEWLVL;
+			NetSendCmdParam2(TRUE, CMD_NEWLVL, fom, lvl);
-		plr[v5]._pInvincible = 1;
+		}
-		PostMessageA(v6, v3, 0, 0);
-		if ( (unsigned char)gbMaxPlayers > 1u )
-			NetSendCmdParam2(1u, CMD_NEWLVL, v3, lvl);
 	}
 }
 // 5BB1ED: using guessed type char leveltype;