version 1.4 | | version 1.5 |
---|
| | |
hud_message(MSGC_MULTI_KILL, "%s(%i) %s(%i).", TXT_YOU_WERE,reactor_kills[killed_pnum], | | hud_message(MSGC_MULTI_KILL, "%s(%i) %s(%i).", TXT_YOU_WERE,reactor_kills[killed_pnum], |
TXT_KILLED_BY_NONPLAY,reactor_kills_total); | | TXT_KILLED_BY_NONPLAY,reactor_kills_total); |
else | | else |
hud_message(MSGC_MULTI_KILL, "%s(%i) %s %s(%i).", killed_name,reactor_kills[killed_pnum], | | hud_message(MSGC_MULTI_KILL, "\002%c%s\004(%i) %s %s(%i).", |
TXT_WAS, TXT_KILLED_BY_NONPLAY,reactor_kills_total ); | | gr_getcolor(player_rgb[killed_pnum].r,player_rgb[killed_pnum].g,player_rgb[killed_pnum].b)+1, |
| | killed_name,reactor_kills[killed_pnum],TXT_WAS, TXT_KILLED_BY_NONPLAY,reactor_kills_total ); |
//end edit -MM | | //end edit -MM |
return; | | return; |
} | | } |
| | |
hud_message(MSGC_MULTI_KILL, "%s(%i) %s %s(%i)!", TXT_YOU,Players[killed_pnum].net_kills_total, | | hud_message(MSGC_MULTI_KILL, "%s(%i) %s %s(%i)!", TXT_YOU,Players[killed_pnum].net_kills_total, |
TXT_KILLED, TXT_YOURSELF,-kill_matrix[killed_pnum][killed_pnum]); | | TXT_KILLED, TXT_YOURSELF,-kill_matrix[killed_pnum][killed_pnum]); |
else | | else |
hud_message(MSGC_MULTI_KILL, "%s(%i) %s(%i)", killed_name,Players[killed_pnum].net_kills_total, | | hud_message(MSGC_MULTI_KILL, "\002%c%s\004(%i) %s(%i)", |
TXT_SUICIDE,-kill_matrix[killed_pnum][killed_pnum]); | | gr_getcolor(player_rgb[killed_pnum].r,player_rgb[killed_pnum].g,player_rgb[killed_pnum].b)+1, |
| | killed_name,Players[killed_pnum].net_kills_total,TXT_SUICIDE,-kill_matrix[killed_pnum][killed_pnum]); |
//end edit -MM | | //end edit -MM |
} | | } |
| | |
| | |
kill_matrix[killer_pnum][killed_pnum] += 1; | | kill_matrix[killer_pnum][killed_pnum] += 1; |
//edited 02/26/99 Matt Mueller - add kill stats to messages | | //edited 02/26/99 Matt Mueller - add kill stats to messages |
if (killer_pnum == Player_num) { | | if (killer_pnum == Player_num) { |
hud_message(MSGC_MULTI_KILL, "%s(%i) %s %s(%i)!", TXT_YOU,Players[killer_pnum].net_kills_total, | | hud_message(MSGC_MULTI_KILL, "%s(%i) %s \002%c%s\004(%i)!", |
TXT_KILLED, killed_name,kill_matrix[killer_pnum][killed_pnum]); | | TXT_YOU,Players[killer_pnum].net_kills_total,TXT_KILLED, |
| | gr_getcolor(player_rgb[killed_pnum].r,player_rgb[killed_pnum].g,player_rgb[killed_pnum].b)+1, |
| | killed_name,kill_matrix[killer_pnum][killed_pnum]); |
if ((Game_mode & GM_MULTI_COOP) && (Players[Player_num].score >= 1000)) | | if ((Game_mode & GM_MULTI_COOP) && (Players[Player_num].score >= 1000)) |
add_points_to_score(-1000); | | add_points_to_score(-1000); |
} | | } |
else if (killed_pnum == Player_num) | | else if (killed_pnum == Player_num) |
hud_message(MSGC_MULTI_KILL, "%s(%i) %s %s(%i)!", killer_name,Players[killer_pnum].net_kills_total, | | hud_message(MSGC_MULTI_KILL, "\002%c%s\004(%i) %s %s(%i)!", |
| | gr_getcolor(player_rgb[killer_pnum].r,player_rgb[killer_pnum].g,player_rgb[killer_pnum].b)+1, |
| | killer_name,Players[killer_pnum].net_kills_total, |
TXT_KILLED, TXT_YOU,kill_matrix[killer_pnum][killed_pnum]); | | TXT_KILLED, TXT_YOU,kill_matrix[killer_pnum][killed_pnum]); |
else | | else |
hud_message(MSGC_MULTI_KILL, "%s(%i) %s %s(%i)!", killer_name,Players[killer_pnum].net_kills_total, | | hud_message(MSGC_MULTI_KILL, "\002%c%s\004(%i) %s \002%c%s\004(%i)!", |
TXT_KILLED, killed_name,kill_matrix[killer_pnum][killed_pnum]); | | gr_getcolor(player_rgb[killer_pnum].r,player_rgb[killer_pnum].g,player_rgb[killer_pnum].b)+1, |
| | killer_name,Players[killer_pnum].net_kills_total,TXT_KILLED, |
| | gr_getcolor(player_rgb[killed_pnum].r,player_rgb[killed_pnum].g,player_rgb[killed_pnum].b)+1, |
| | killed_name,kill_matrix[killer_pnum][killed_pnum]); |
//end edit -MM | | //end edit -MM |
} | | } |
multi_sort_kill_list(); | | multi_sort_kill_list(); |
| | |
//added on 12/29/98 by Victor Rachels for irc style /me. | | //added on 12/29/98 by Victor Rachels for irc style /me. |
if ((strlen(buf+loc) > 3) && !strnicmp("/ME",buf+loc,3)) | | if ((strlen(buf+loc) > 3) && !strnicmp("/ME",buf+loc,3)) |
{ | | { |
| | int col=gr_getcolor(player_rgb[pnum].r,player_rgb[pnum].g,player_rgb[pnum].b)+1;// note the +1 ! |
digi_play_sample(SOUND_HUD_MESSAGE, F1_0); | | digi_play_sample(SOUND_HUD_MESSAGE, F1_0); |
//hud_message(MSGC_MULTI_USERMSG, "*%s%s", Players[pnum].callsign, buf+loc+3*sizeof(char)); | | //hud_message(MSGC_MULTI_USERMSG, "*%s%s", Players[pnum].callsign, buf+loc+3*sizeof(char)); |
hud_message(MSGC_MULTI_USERMSG, "\001%c*%s\002%s", | | hud_message(MSGC_MULTI_USERMSG, "\001%c*%s\004\003%c%s\006", |
gr_getcolor(player_rgb[pnum].r,player_rgb[pnum].g,player_rgb[pnum].b)+1,// note the +1 ! | | col, Players[pnum].callsign, col, buf+loc+3*sizeof(char)); |
Players[pnum].callsign, buf+loc+3*sizeof(char)); | | |
} | | } |
//end this addition - VR | | //end this addition - VR |
else if (((colon = strrchr(buf+loc, ':')) == NULL) || (colon-(buf+loc) < 1) || (colon-(buf+loc) > CALLSIGN_LEN)) | | else if (((colon = strrchr(buf+loc, ':')) == NULL) || (colon-(buf+loc) < 1) || (colon-(buf+loc) > CALLSIGN_LEN)) |
{ | | { |
| | int col=gr_getcolor(player_rgb[pnum].r,player_rgb[pnum].g,player_rgb[pnum].b)+1;// note the +1 ! |
digi_play_sample(SOUND_HUD_MESSAGE, F1_0); | | digi_play_sample(SOUND_HUD_MESSAGE, F1_0); |
//hud_message(MSGC_MULTI_USERMSG, "%s %s '%s'", Players[(int)buf[1]].callsign, TXT_SAYS, buf+loc); | | //hud_message(MSGC_MULTI_USERMSG, "%s %s '%s'", Players[(int)buf[1]].callsign, TXT_SAYS, buf+loc); |
hud_message(MSGC_MULTI_USERMSG, "\001%c%s\002 %s '%s'", | | hud_message(MSGC_MULTI_USERMSG, "\001%c%s\004 \003%c%s '%s'\006", |
gr_getcolor(player_rgb[pnum].r,player_rgb[pnum].g,player_rgb[pnum].b)+1,// note the +1 ! | | col, Players[pnum].callsign, col, TXT_SAYS, buf+loc); |
Players[pnum].callsign, TXT_SAYS, buf+loc); | | |
} | | } |
//added on 11/10/98 by Victor Rachels to add handicapping | | //added on 11/10/98 by Victor Rachels to add handicapping |
else if ( (!strncasecmp(Players[Player_num].callsign, buf+loc, colon-(buf+loc))) && | | else if ( (!strncasecmp(Players[Player_num].callsign, buf+loc, colon-(buf+loc))) && |
| | |
else if ( (!strncasecmp(Players[Player_num].callsign, buf+loc, colon-(buf+loc))) || | | else if ( (!strncasecmp(Players[Player_num].callsign, buf+loc, colon-(buf+loc))) || |
((Game_mode & GM_TEAM) && ( (get_team(Player_num) == atoi(buf+loc)-1) || !strncasecmp(Netgame.team_name[get_team(Player_num)], buf+loc, colon-(buf+loc)))) ) | | ((Game_mode & GM_TEAM) && ( (get_team(Player_num) == atoi(buf+loc)-1) || !strncasecmp(Netgame.team_name[get_team(Player_num)], buf+loc, colon-(buf+loc)))) ) |
{ | | { |
| | int col=gr_getcolor(player_rgb[pnum].r,player_rgb[pnum].g,player_rgb[pnum].b)+1;// note the +1 ! |
digi_play_sample(SOUND_HUD_MESSAGE, F1_0); | | digi_play_sample(SOUND_HUD_MESSAGE, F1_0); |
//hud_message(MSGC_MULTI_USERMSG, "%s %s '%s'", Players[(int)buf[1]].callsign, TXT_TELLS_YOU, (colon+1)); | | //hud_message(MSGC_MULTI_USERMSG, "%s %s '%s'", Players[(int)buf[1]].callsign, TXT_TELLS_YOU, (colon+1)); |
hud_message(MSGC_MULTI_USERMSG, "\001%c%s\002 %s '%s'", | | hud_message(MSGC_MULTI_USERMSG, "\001%c%s\004 \003%c%s '%s'\006", |
gr_getcolor(player_rgb[pnum].r,player_rgb[pnum].g,player_rgb[pnum].b)+1,// note the +1 ! | | col, Players[pnum].callsign, col, TXT_TELLS_YOU, (colon+1)); |
Players[pnum].callsign, TXT_TELLS_YOU, (colon+1)); | | |
} | | } |
else if (colon - (buf + loc) == 4) | | else if (colon - (buf + loc) == 4) |
{ | | { |