From da757190cc36b3e9cc1ddbce11fc59ad66b3ffce Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sat, 30 Mar 2013 19:22:48 +0000
Subject: [PATCH] Simplify processing of $ insertion of name in multiplayer
 messages

---
 main/multi.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/main/multi.c b/main/multi.c
index 740381519..fb79bde19 100644
--- a/main/multi.c
+++ b/main/multi.c
@@ -1603,18 +1603,17 @@ multi_do_message(char *buf)
 {
 	char *colon;
 	char *tilde,mesbuf[100];
+	char dollarbuf[100];
 	int tloc,t;
 
-	int loc = 2;
+	int loc = 0;
+	buf += 2;
 
 	if ((tilde=strchr (buf+loc,'$')))  // do that stupid name stuff
 	{											// why'd I put this in?  Probably for the
 		tloc=tilde-(buf+loc);				// same reason you can name your guidebot
-		if (tloc>0)
-			strncpy (mesbuf,buf+loc,tloc);
-		strcpy (mesbuf+tloc,Players[Player_num].callsign);
-		strcpy (mesbuf+strlen(Players[Player_num].callsign)+tloc,buf+loc+tloc+1);
-		strcpy (buf+loc,mesbuf);
+		snprintf(dollarbuf, sizeof(dollarbuf), "%.*s%s%s", tloc, buf, Players[Player_num].callsign, buf+tloc+1);
+		buf = dollarbuf;
 	}
 
 	if (((colon = strstr(buf+loc, ": ")) == NULL) || (colon-(buf+loc) < 1) || (colon-(buf+loc) > CALLSIGN_LEN))