TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Factor out kill names in multi_compute_kill

Browse source
This commit is contained in:
Kp 2016-01-26 03:45:07 +00:00
parent c641a0404a
commit c476c42e8e
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
similar/main/multi.cpp
View file

@ -876,8 +876,8 @@ static void multi_compute_kill(const objptridx_t killer, const vobjptridx_t kill
}
Players[killed_pnum].net_killed_total += 1;
const char *name0, *name1;
if (killer_pnum == Player_num) {
HUD_init_message(HM_MULTI, "%s %s %s!", TXT_YOU, TXT_KILLED, killed_name);
if (Game_mode & GM_MULTI_COOP)
{
const auto local_player_score = get_local_player().score;
@ -885,14 +885,17 @@ static void multi_compute_kill(const objptridx_t killer, const vobjptridx_t kill
}
else
multi_add_lifetime_kills(adjust);
name0 = TXT_YOU;
name1 = killed_name;
}
else if (killed_pnum == Player_num)
else if (name0 = killer_name, killed_pnum == Player_num)
{
HUD_init_message(HM_MULTI, "%s %s %s!", killer_name, TXT_KILLED, TXT_YOU);
multi_add_lifetime_killed();
name1 = TXT_YOU;
}
else
HUD_init_message(HM_MULTI, "%s %s %s!", killer_name, TXT_KILLED, killed_name);
name1 = killed_name;
HUD_init_message(HM_MULTI, "%s %s %s!", name0, TXT_KILLED, name1);
}
if (Netgame.KillGoal>0)