From cac24d12fa6fcbbd35c40a5e7f8228447d478557 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Thu, 24 Jun 2021 02:04:00 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8FClean=20up=20msg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Source/msg.cpp | 56 ++++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/Source/msg.cpp b/Source/msg.cpp
index 0f2310919..b0a720e75 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -2216,38 +2216,40 @@ static DWORD On_ACK_PLRINFO(TCmd *pCmd, int pnum)
 static DWORD On_PLAYER_JOINLEVEL(TCmd *pCmd, int pnum)
 {
 	auto *p = (TCmdLocParam1 *)pCmd;
-	auto &player = plr[pnum];
 
-	if (gbBufferMsgs == 1)
+	if (gbBufferMsgs == 1) {
 		msg_send_packet(pnum, p, sizeof(*p));
-	else {
-		player._pLvlChanging = false;
-		if (player._pName[0] != 0 && !player.plractive) {
-			ResetPlayerGFX(player);
-			player.plractive = true;
-			gbActivePlayers++;
-			EventPlrMsg(fmt::format(_("Player '{:s}' (level {:d}) just joined the game"), player._pName, player._pLevel).c_str());
-		}
+		return sizeof(*p);
+	}
 
-		if (player.plractive && myplr != pnum) {
-			player.position.tile = { p->x, p->y };
-			player.plrlevel = p->wParam1;
-			ResetPlayerGFX(player);
-			if (currlevel == player.plrlevel) {
-				SyncInitPlr(pnum);
-				if ((player._pHitPoints >> 6) > 0)
-					StartStand(pnum, DIR_S);
-				else {
-					player._pgfxnum = 0;
-					player._pmode = PM_DEATH;
-					NewPlrAnim(player, player_graphic::Death, DIR_S, player._pDFrames, 1);
-					player.AnimInfo.CurrentFrame = player.AnimInfo.NumberOfFrames - 1;
-					dFlags[player.position.tile.x][player.position.tile.y] |= BFLAG_DEAD_PLAYER;
-				}
+	auto &player = plr[pnum];
 
-				player._pvid = AddVision(player.position.tile, player._pLightRad, pnum == myplr);
-				player._plid = NO_LIGHT;
+	player._pLvlChanging = false;
+	if (player._pName[0] != 0 && !player.plractive) {
+		ResetPlayerGFX(player);
+		player.plractive = true;
+		gbActivePlayers++;
+		EventPlrMsg(fmt::format(_("Player '{:s}' (level {:d}) just joined the game"), player._pName, player._pLevel).c_str());
+	}
+
+	if (player.plractive && myplr != pnum) {
+		player.position.tile = { p->x, p->y };
+		player.plrlevel = p->wParam1;
+		ResetPlayerGFX(player);
+		if (currlevel == player.plrlevel) {
+			SyncInitPlr(pnum);
+			if ((player._pHitPoints >> 6) > 0)
+				StartStand(pnum, DIR_S);
+			else {
+				player._pgfxnum = 0;
+				player._pmode = PM_DEATH;
+				NewPlrAnim(player, player_graphic::Death, DIR_S, player._pDFrames, 1);
+				player.AnimInfo.CurrentFrame = player.AnimInfo.NumberOfFrames - 1;
+				dFlags[player.position.tile.x][player.position.tile.y] |= BFLAG_DEAD_PLAYER;
 			}
+
+			player._pvid = AddVision(player.position.tile, player._pLightRad, pnum == myplr);
+			player._plid = NO_LIGHT;
 		}
 	}