From 10521d161ce10f35ae1962b70e888580ea64ad4f Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Fri, 21 Dec 2018 22:28:28 -0500
Subject: [PATCH] Fix various bugs with the chat.

---
 src/d_clisrv.c | 5 +----
 src/hu_stuff.c | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 8477aac3e5..2529b05d0e 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2762,7 +2762,7 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
 		msg = KICK_MSG_CON_FAIL;
 	}
 
-	CONS_Printf("\x82%s ", player_names[pnum]);
+	//CONS_Printf("\x82%s ", player_names[pnum]);
 
 	// If a verified admin banned someone, the server needs to know about it.
 	// If the playernum isn't zero (the server) then the server needs to record the ban.
@@ -3119,9 +3119,6 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
 	if (newplayernum+1 > doomcom->numslots)
 		doomcom->numslots = (INT16)(newplayernum+1);
 
-	if (netgame)
-		CONS_Printf(M_GetText("Player %d has joined the game (node %d)\n"), newplayernum+1, node);
-
 	// the server is creating my player
 	if (node == mynode)
 	{
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 5941c68dca..771628efbf 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -941,7 +941,7 @@ static void HU_queueChatChar(char c)
 		{
 			INT32 spc = 1;	// used if nodenum[1] is a space.
 			char *nodenum = (char*) malloc(3);
-			const char *newmsg = msg+5+spc;
+			const char *newmsg;
 
 			// what we're gonna do now is check if the node exists
 			// with that logic, characters 4 and 5 are our numbers:
@@ -990,6 +990,7 @@ static void HU_queueChatChar(char c)
 			}
 
 			// we need to get rid of the /pm<node>
+			newmsg = msg+5+spc;
 			memcpy(msg, newmsg, 255);
 		}
 		if (ci > 3) // don't send target+flags+empty message.
-- 
GitLab