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

Use team_kills in team games

Browse source
This commit is contained in:
Kp 2015-10-03 22:15:17 +00:00
parent b447adcce1
commit 4a0a2b7da5
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
similar/main/multi.cpp
View file

@ -618,7 +618,6 @@ static void multi_compute_kill(const objptridx_t killer, const vobjptridx_t kill
// appropriate player's tally. // appropriate player's tally.
playernum_t killed_pnum, killer_pnum; playernum_t killed_pnum, killer_pnum;
int TheGoal;
// Both object numbers are localized already! // Both object numbers are localized already!
@ -812,11 +811,13 @@ static void multi_compute_kill(const objptridx_t killer, const vobjptridx_t kill
HUD_init_message(HM_MULTI, "%s %s %s!", killer_name, TXT_KILLED, killed_name); HUD_init_message(HM_MULTI, "%s %s %s!", killer_name, TXT_KILLED, killed_name);
} }
TheGoal=Netgame.KillGoal*5;
if (Netgame.KillGoal>0) if (Netgame.KillGoal>0)
{ {
if (Players[killer_pnum].KillGoalCount>=TheGoal) const auto TheGoal = Netgame.KillGoal * 5;
if (((Game_mode & GM_TEAM)
? Players[killer_pnum].KillGoalCount
: team_kills[get_team(killer_pnum)]
) >= TheGoal)
{ {
if (killer_pnum==Player_num) if (killer_pnum==Player_num)
{ {
@ -824,7 +825,10 @@ static void multi_compute_kill(const objptridx_t killer, const vobjptridx_t kill
get_local_player().shields=i2f(200); get_local_player().shields=i2f(200);
} }
else else
HUD_init_message(HM_MULTI, "%s has reached the kill goal!", static_cast<const char *>(Players[killer_pnum].callsign)); {
char buf[(CALLSIGN_LEN*2)+4];
HUD_init_message(HM_MULTI, "%s has reached the kill goal!", prepare_kill_name(killer_pnum, buf));
}
HUD_init_message_literal(HM_MULTI, "The control center has been destroyed!"); HUD_init_message_literal(HM_MULTI, "The control center has been destroyed!");
net_destroy_controlcen (obj_find_first_of_type (OBJ_CNTRLCEN)); net_destroy_controlcen (obj_find_first_of_type (OBJ_CNTRLCEN));