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

This commit is contained in:
zicodxx 2013-01-08 11:42:10 +01:00
parent a43f76e7ac
commit 9d16bf74d3
4 changed files with 8 additions and 4 deletions

View file

@ -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

View file

@ -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;

View file

@ -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

View file

@ -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
{