From 9d16bf74d3bcda9a86f76188c9fdb9b585f5f57f Mon Sep 17 00:00:00 2001
From: zicodxx <zico@dxx-rebirth.com>
Date: Tue, 8 Jan 2013 11:42:10 +0100
Subject: [PATCH] Fixed some minor HUD-text related issues: For team assignment
 messages, joining player name would appear; team color assignment in netgame
 info screen could be wrong due to wrong syntax handling; when rewrapping text
 messages to specific player, game would not add space behind colon

---
 CHANGELOG.txt   | 4 ++++
 main/gamerend.c | 4 ++--
 main/multi.c    | 2 +-
 main/net_udp.c  | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 93acce5b4..b619e786e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20130108
+--------
+main/gamerend.c, main/multi.c, net_udp.c: Fixed some minor HUD-text related issues: For team assignment messages, joining player name would appear; team color assignment in netgame info screen could be wrong due to wrong syntax handling; when rewrapping text messages to specific player, game would not add space behind colon
+
 20130103
 --------
 main/net_udp.c: Centralized UDP Broadcast function for IPv4 and IPv6 calls - patch by Kp
diff --git a/main/gamerend.c b/main/gamerend.c
index 6ce059199..dc6648333 100644
--- a/main/gamerend.c
+++ b/main/gamerend.c
@@ -213,11 +213,11 @@ void show_netplayerinfo()
 		gr_printf(x,y,"team");
 		gr_printf(x+FSPACX(8)*8,y,"score");
 		y+=LINE_SPACING;
-		gr_set_fontcolor(BM_XRGB(player_rgb[get_team(0)].r,player_rgb[get_team(0)].g,player_rgb[get_team(0)].b),-1 );
+		gr_set_fontcolor(BM_XRGB(player_rgb[0].r,player_rgb[0].g,player_rgb[0].b),-1 );
 		gr_printf(x,y,"%s:",Netgame.team_name[0]);
 		gr_printf(x+FSPACX(8)*8,y,"%i",team_kills[0]);
 		y+=LINE_SPACING;
-		gr_set_fontcolor(BM_XRGB(player_rgb[get_team(1)].r,player_rgb[get_team(1)].g,player_rgb[get_team(1)].b),-1 );
+		gr_set_fontcolor(BM_XRGB(player_rgb[1].r,player_rgb[1].g,player_rgb[1].b),-1 );
 		gr_printf(x,y,"%s:",Netgame.team_name[1]);
 		gr_printf(x+FSPACX(8)*8,y,"%i",team_kills[1]);
 		y+=LINE_SPACING*2;
diff --git a/main/multi.c b/main/multi.c
index 04cbe4816..e26eedd77 100644
--- a/main/multi.c
+++ b/main/multi.c
@@ -1485,7 +1485,7 @@ int multi_message_input_sub(int key)
 					if ( ptext )    {
 						multi_sending_message[Player_num] = 1;
 						multi_send_msgsend_state(1);
-						pcolon = strchr( Network_message, ':' );
+						pcolon = strstr( Network_message, ": " );
 						if ( pcolon )
 							strcpy( pcolon+1, ptext );
 						else
diff --git a/main/net_udp.c b/main/net_udp.c
index b0c9b2624..01b32996b 100644
--- a/main/net_udp.c
+++ b/main/net_udp.c
@@ -4987,7 +4987,7 @@ void net_udp_do_refuse_stuff (UDP_sequence_packet *their)
 			{
 				HUD_init_message(HM_MULTI, "%s wants to join",their->player.callsign);
 			}
-			HUD_init_message(HM_MULTI, "Alt-1 assigns to team %s. Alt-2 to team %s",their->player.callsign,Netgame.team_name[0],Netgame.team_name[1]);
+			HUD_init_message(HM_MULTI, "Alt-1 assigns to team %s. Alt-2 to team %s",Netgame.team_name[0],Netgame.team_name[1]);
 		}
 		else
 		{